Settings: keep the Replay onboarding description inside its card

The Replay onboarding section rendered its description as a section footer, so
the text sat below the card while every other control card shows its description
inside the card above a hairline. Move the same copy into the section body as a
footnote/secondary row. Wording, the replay action and its behaviour are
unchanged; only the Fuel Savings general explanation and the Support tip note
remain section footers.

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 = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				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 = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				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 = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				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 = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				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 = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				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 = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				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 = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				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 = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = "Config/Widget-Info.plist";

FuelBoard/AlertsView.swift

@@ -13,7 +13,10 @@ struct AlertsView: View {
     @Binding var radius: Double   // stored in km (monitor + storage)
     @Binding var fuel: FuelType   // the fuel alerts monitor for
     @Binding var alertMode: AlertMode
-    @Binding var bestValueThresholdGBP: Double
+    /// 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
@@ -178,16 +181,13 @@ struct AlertsView: View {
                         .font(.caption)
                         .foregroundStyle(.secondary)
                     if alertMode == .bestValue {
-                        Picker(String(localized: "Minimum saving", comment: "Best Value alert threshold picker title"), selection: $bestValueThresholdGBP) {
+                        // The threshold is edited in Settings → Fuel Savings: it
-                            ForEach(FuelStore.bestValueAlertThresholdOptionsGBP, id: \.self) { value in
+                        // labels station rows BEST VALUE as well as gating this
-                                Text(FuelSavingsFormat.money(value)).tag(value)
+                        // 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)))
-                        if !bestValueConfigured {
+                            .font(.caption)
-                            Text(String(localized: "Set up Best Value first so FuelBoard can account for your fill size, MPG and travel cost.", comment: "Best Value alert setup hint"))
+                            .foregroundStyle(.secondary)
-                                .font(.caption)
-                                .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"))

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

@@ -29,10 +29,10 @@ struct ContentView: View {
     @State private var sortMode: SortMode = ContentView.qaSortModeOverride(default: FuelStore.loadSortMode())
     @State private var stationLimit: Int = ContentView.qaStationRadiusOverride(default: FuelStore.loadStationLimit())
     @State private var distanceUnit: DistanceUnit = FuelStore.loadDistanceUnit()
-    @State private var priceDisplayStyle: PriceDisplayStyle = FuelStore.loadPriceDisplayStyle()
+    @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()
@@ -114,6 +114,21 @@ struct ContentView: View {
         return fallback
     }
 
+    /// QA hook: `-priceStyle poundsPence` renders prices in the wide pounds &
+    /// pence form for ONE launch. Same reason as `-sortMode`: simctl has no tap
+    /// command, so the wide price has to be measured against the row's column
+    /// widths without walking Settings → Units for every check. Never persisted.
+    private static func qaPriceStyleOverride(default fallback: PriceDisplayStyle) -> PriceDisplayStyle {
+#if DEBUG
+        let args = ProcessInfo.processInfo.arguments
+        if let i = args.firstIndex(of: "-priceStyle"), i + 1 < args.count,
+           let style = PriceDisplayStyle(rawValue: args[i + 1]) {
+            return style
+        }
+#endif
+        return fallback
+    }
+
     private static func qaSortModeOverride(default fallback: SortMode) -> SortMode {
 #if DEBUG
         let args = ProcessInfo.processInfo.arguments
@@ -160,8 +175,29 @@ struct ContentView: View {
         )
     }
 
+    /// 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 = { [weak monitor] in
+        locationManager.onLocationUpdate = {
             self.updateAlertMonitor()
             // The Live Activity follows the same wake-ups — this hook
             // fires on every fix incl. background significant-change
@@ -401,28 +437,27 @@ struct ContentView: View {
     /// (computing a journey for each) and `savingsLookup` immediately scanned them
     /// all AGAIN to fill the per-station map. Both now share one result.
     ///
-    /// The baseline is chosen with EXACTLY the loop and guards of
+    /// The baseline is chosen with the same journey guards as
-    /// `FuelSavingsEstimator.baselineStation`, so the row labelled "Closest
+    /// `FuelSavingsEstimator.baselineStation` when configured; with the feature
-    /// station" cannot move — and it is still selected when the feature is
+    /// off, the ordinary Closest station still names that row.
-    /// unconfigured (it names that row), while the maps are only built when the
-    /// labels will actually be shown.
     private func savingsScaffold() -> (baseline: FuelStation?, journeys: [String: FuelSavingsJourney]) {
         guard let location else { return (nil, [:]) }
-        let configured = fuelSavingsSettings.isConfigured
+        guard fuelSavingsSettings.isConfigured else {
+            let baseline = FuelSavingsEstimator.baselineStation(stations, fuel: selectedFuel) {
+                savingsJourneyMiles(for: $0, location: location)
+            }
+            return (baseline, [:])
+        }
         var journeys: [String: FuelSavingsJourney] = [:]
-        var bestStation: FuelStation?
-        var bestMiles = Double.infinity
         for station in stations where station.prices[selectedFuel] != nil {
-            guard let journey = savingsJourneyMiles(for: station, location: location) else { continue }
+            if let journey = savingsJourneyMiles(for: station, location: location) {
-            if configured { journeys[station.id] = journey }
+                journeys[station.id] = journey
-            let miles = journey.miles
-            guard miles.isFinite, miles >= 0 else { continue }
-            if miles < bestMiles {
-                bestMiles = miles
-                bestStation = station
             }
         }
-        return (bestStation, configured ? journeys : [:])
+        let baseline = FuelSavingsEstimator.baselineStation(stations, fuel: selectedFuel) {
+            journeys[$0.id]
+        }
+        return (baseline, journeys)
     }
 
     /// Row/detail savings lookup with the comparison baseline and the per-station
@@ -566,10 +601,34 @@ struct ContentView: View {
         func source(_ basis: FuelSavingsDistanceBasis) -> String {
             basis == .roadRoute ? "road route" : "straight-line estimate"
         }
-        let price = station.prices[selectedFuel].map { String(format: "%.1fp/L", $0) } ?? "—"
+        func amount(_ value: FuelSavingsFillAmount) -> String {
-        let baselinePrice = baseline?.prices[selectedFuel].map { String(format: "%.1fp/L", $0) } ?? "—"
+            switch value.unit {
+            case .pounds: return String(format: "£%.2f", value.value)
+            case .litres: return String(format: "%.2f L", value.value)
+            }
+        }
+        func rawMoney(_ value: Double?) -> String {
+            value.map { String(format: "£%.6f", $0) } ?? "—"
+        }
+        let candidatePriceValue = station.prices[selectedFuel]
+        let baselinePriceValue = baseline?.prices[selectedFuel]
+        let price = candidatePriceValue.map { String(format: "%.1fp/L", $0) } ?? "—"
+        let baselinePrice = baselinePriceValue.map { String(format: "%.1fp/L", $0) } ?? "—"
+        let priceDifference = candidatePriceValue.flatMap { candidate in
+            baselinePriceValue.map { String(format: "%+.1fp/L", $0 - candidate) }
+        } ?? "—"
+        let litresBasis = sessionFuelSavingsAmount.unit == .pounds ? "candidate price" : "fixed litres"
         let rows: [(String, String)] = [
             ("Station", "\(station.name) (\(station.id))"),
+            ("Settings default fill-up", amount(fuelSavingsSettings.preferredAmount)),
+            ("Effective/session fill-up", amount(sessionFuelSavingsAmount)),
+            ("Fill-up unit", sessionFuelSavingsAmount.unit.displayName),
+            ("MPG", String(format: "%.1f UK MPG", fuelSavingsSettings.mpg)),
+            ("Candidate price", price),
+            ("Baseline price", baselinePrice),
+            ("Price difference", priceDifference),
+            ("Candidate litres", result.map { String(format: "%.6f L · %@", $0.fillLitres, litresBasis) } ?? "—"),
+            ("Gross saving raw", rawMoney(result?.grossSavingGBP)),
             ("Displayed distance", "\(distanceUnit.format(stationDistance.displayDistanceKM)) · \(source(stationDistance.displaySource))"),
             ("Outward road", meters(stationDistance.outwardMeters)),
             ("Return road", stationDistance.hasMeasuredReturn ? meters(stationDistance.returnMeters) : "inferred or unavailable"),
@@ -581,12 +640,11 @@ struct ContentView: View {
             ("Station journey", miles(journey?.miles)),
             ("Baseline journey", miles(baselineJourney?.miles)),
             ("Additional journey", miles(result?.extraDistanceMiles)),
+            ("Additional fuel used", result.map { String(format: "%.6f L", $0.extraFuelLitres) } ?? "—"),
             ("Confidence", result?.journeyConfidence.rawValue ?? "estimated"),
-            ("Fuel price", price),
+            ("Travel cost raw", rawMoney(result?.extraDrivingCostGBP)),
-            ("Baseline price", baselinePrice),
+            ("Net saving raw", rawMoney(result?.netSavingGBP)),
-            ("Gross saving", result.map { FuelSavingsFormat.money($0.grossSavingGBP) } ?? "—"),
+            ("Displayed net saving", result?.headline() ?? "—")
-            ("Travel cost", result.map { FuelSavingsFormat.money($0.extraDrivingCostGBP) } ?? "—"),
-            ("Net saving", result.map { FuelSavingsFormat.money($0.netSavingGBP) } ?? "—")
         ]
         return FuelSavingsJourneyDiagnostics(rows: rows)
         #else
@@ -777,6 +835,7 @@ struct ContentView: View {
                         station: station,
                         location: location,
                         distanceUnit: distanceUnit,
+                        priceStyle: priceDisplayStyle,
                         fuelSavings: savingsLookup(baseline: scaffold.baseline,
                                                    journeys: scaffold.journeys)(station),
                         fuelSavingsAmount: sessionFuelSavingsAmount,
@@ -806,6 +865,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,
@@ -1096,6 +1164,11 @@ struct ContentView: View {
             }
         }
         .onChange(of: fuelSavingsSettings) { old, new in
+            // An explicit Settings default edit supersedes the temporary slider
+            // override. Changes to MPG/enabled alone leave the session fill intact.
+            if old.preferredAmount != new.preferredAmount {
+                sessionFuelSavingsAmount = new.preferredAmount
+            }
             // Fuel Savings changed in Settings while the app was running: the
             // effective sort follows automatically (no stored sort is touched).
 #if DEBUG
@@ -1104,6 +1177,13 @@ struct ContentView: View {
             ensureBestValueAlertModeIsAvailable()
             updateAlertMonitor()
         }
+        .onChange(of: sessionFuelSavingsAmount) { _, _ in
+            // This remains a session-only override: do not write it to FuelStore.
+            // Any active Best Value alert/Live Activity must nevertheless use
+            // the same effective amount as rows, details, favourites and sorting.
+            updateAlertMonitor()
+            updateLiveActivity()
+        }
         .onChange(of: scenePhase) { _, newPhase in
             if newPhase == .active {
                 // Never start location tracking while onboarding is on screen —
@@ -1493,7 +1573,6 @@ struct ContentView: View {
             fuelSavingsSettings: fuelSavingsSettings,
             fuelSavingsAmount: $sessionFuelSavingsAmount,
             savingsForStation: savingsLookup(baseline: baselineStation, journeys: scaffold.journeys),
-            savingsBaselineStationName: baselineStation?.name,
             journeyDiagnosticsForStation: { station in journeyDiagnostics(for: station, baseline: baselineStation) },
             onToggleFavourite: toggleFavourite,
             onRefresh: { await refresh(force: true) }
@@ -1515,7 +1594,6 @@ struct ContentView: View {
             fuelSavingsSettings: fuelSavingsSettings,
             fuelSavingsAmount: $sessionFuelSavingsAmount,
             savingsForStation: savingsLookup(baseline: baselineStation, journeys: scaffold.journeys),
-            savingsBaselineStationName: baselineStation?.name,
             journeyDiagnosticsForStation: { station in journeyDiagnostics(for: station, baseline: baselineStation) },
             onToggleFavourite: toggleFavourite,
             onReorder: reorderFavourites,
@@ -1532,7 +1610,7 @@ struct ContentView: View {
             radius: $alertsRadius,
             fuel: $alertsFuel,
             alertMode: $alertsMode,
-            bestValueThresholdGBP: $alertsBestValueThresholdGBP,
+            bestValueThresholdGBP: alertsBestValueThresholdGBP,
             bestValueConfigured: fuelSavingsSettings.isConfigured,
             favouriteDropEnabled: $favouriteDropAlertsEnabled,
             favouriteDropFuel: $favouriteDropAlertsFuel,
@@ -1560,6 +1638,7 @@ struct ContentView: View {
             priceDisplayStyle: $priceDisplayStyle,
             stationTapAction: $stationTapAction,
             fuelSavingsSettings: $fuelSavingsSettings,
+            bestValueThresholdGBP: $alertsBestValueThresholdGBP,
             dataRefreshMode: $dataRefreshMode,
             alertsFuel: alertsFuel,
             alertsRadiusKM: alertsRadius,
@@ -1743,20 +1822,47 @@ struct StationRow: View {
     let distanceUnit: DistanceUnit
     let priceDisplayStyle: PriceDisplayStyle
     let baselinePrice: Double?
+    /// This row is the cheapest price in range — the caller's existing
+    /// `topStationID` test. Feeds the CHEAPEST badge.
     let isTopResult: Bool
     let isFavourite: Bool
-    /// Label for the cheapest-pump-price badge ("TOP" in price/distance order,
-    /// "CHEAPEST" when the list is ranked by net saving).
-    var topBadgeText: String = "TOP"
     var tapAction: StationTapAction = .openMap
     var fuelSavings: FuelSavingsAvailability?
-    /// The session fill-up figure (the one the adjustment control edits). The
+    /// The user's Best Value alert threshold — the app's existing gate for
-    /// compact banner does not print it today, but a row that carried a hard
+    /// calling a saving worth the drive, so a row labels itself BEST VALUE by
-    /// zero would print "for £0" the moment it did — pass the real figure.
+    /// exactly the rule the alerts already use. Read per row (the alert path
-    var fuelSavingsAmount: FuelSavingsFillAmount = FuelSavingsSettings.defaultPreferredAmount
+    /// reads it per evaluation too); pass explicitly to inject a value.
+    var bestValueThresholdGBP: Double = FuelStore.loadAlertsBestValueThresholdGBP()
     var onToggleFavourite: () -> Void = {}
     var onShowDetails: (FuelStation) -> Void = { _ in }
 
+    /// The price's point size, scaled with Dynamic Type: the price is built from
+    /// an explicit size (its "p"/"/L" suffixes are sized relative to it inside
+    /// `priceTextAttributed`), so it needs a metric rather than a font style.
+    /// 22pt keeps the price the row's loudest element after the station name.
+    @ScaledMetric(relativeTo: .title2) private var priceSize: CGFloat = 22
+
+    /// The identity column's share of the ROW, for every row and both price
+    /// 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
+    /// instead of widening the column and dragging the hairline with it.
+    ///
+    /// 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`
+    /// — ~20pt wider than the bare `158.7` at the same point size — did not fit on
+    /// a 393pt screen. With the star now under the station logo the price column
+    /// has that width back, so the identity column no longer has to give width up
+    /// 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 }
         switch RAGRating.rating(price: price, cheapest: baselinePrice) {
@@ -1782,6 +1888,26 @@ struct StationRow: View {
         return abs(price - baselinePrice) <= 0.05
     }
 
+    /// The row's single recommendation badge, if any. BEST VALUE (worth the
+    /// drive by the alert threshold) outranks CHEAPEST; NEAREST never gets one,
+    /// being context rather than a recommendation.
+    private var recommendationBadge: StationRecommendationBadge? {
+        StationRecommendationBadge.badge(
+            netSavingGBP: fuelSavings?.result?.netSavingGBP,
+            isCheapest: isTopResult,
+            bestValueThresholdGBP: bestValueThresholdGBP
+        )
+    }
+
+    /// VoiceOver: the price, then the delta the redesign no longer prints — the
+    /// listing shows a savings capsule in its place, so the comparison against
+    /// the cheapest price in range would otherwise be visible only as a colour.
+    private func priceSpokenLabel(_ price: Double) -> String {
+        guard let deltaText else { return FuelStore.priceTextSpoken(price) }
+        let comparison = String(localized: "vs cheapest", comment: "Price delta comparison caption")
+        return "\(FuelStore.priceTextSpoken(price)), \(isCheapestPrice ? deltaText : "\(deltaText) \(comparison)")"
+    }
+
     private func handleTap() {
         switch tapAction {
         case .openMap:
@@ -1798,132 +1924,231 @@ struct StationRow: View {
     }
 
     var body: some View {
-        VStack(alignment: .leading, spacing: 6) {
+        // Two sections, one hairline: station identity on the left, price and
-        HStack(spacing: 12) {
+        // savings on the right. No wrapper VStack and no full-width verdict
-            // LEFT — round brand logo (or generic fuel pump fallback)
+        // banner under the row — the savings capsule carries the verdict inside
-            Group {
+        // the right-hand column, and the extra travel behind it is explained in
-                if let asset = station.brandImageName {
+        // the detail sheet instead of being repeated on every row.
-                    Image(asset)
+        HStack(alignment: .center, spacing: 12) {
-                        .resizable()
+            // LEFT SECTION — station identity: brand logo, then name, address and
-                        .scaledToFit()
+            // distance. Given a FIXED SHARE of the row (~52%, the mockup's ratio)
-                        .padding(5)
+            // rather than sizing to its content: sized to content, this column
-                } else {
+            // grew and shrank with each row's badge and savings copy, which moved
-                    Image(systemName: "fuelpump.fill")
+            // the hairline 23pt between adjacent rows (x767 on a BEST VALUE row,
-                        .font(.system(size: 22, weight: .semibold))
+            // x699 on a "costs more" row) — so the divider and the price axis
-                        .foregroundStyle(Color.black.opacity(0.82))
+            // both jumped sideways as the list scrolled. One share for every row
-                }
+            // puts them on a single vertical line down the whole list.
-            }
+            HStack(alignment: .top, spacing: 12) {
-            .frame(width: 46, height: 46)
+                // The logo, with the favourite star directly beneath it. Moving
-            .background(Circle().fill(Color.white))
+                // the star out of the price line is what gives the price column
-            .clipShape(Circle())
+                // its width back: sat at the end of that line it held ~28pt of
-            .overlay(Circle().stroke(Color.primary.opacity(0.10), lineWidth: 1))
+                // the column, which is exactly the space the wide pounds &
-            .shadow(color: .black.opacity(0.08), radius: 2, y: 1)
+                // pence price needs for its own digits on a 393pt screen.
+                // 10pt between logo and star: at 4pt the star's glyph sat almost
+                // against the logo's bottom edge and read as part of it rather
+                // than as the control it is.
+                VStack(spacing: 10) {
+                    // Round brand logo (or generic fuel pump fallback)
+                    Group {
+                        if let asset = station.brandImageName {
+                            Image(asset)
+                                .resizable()
+                                .scaledToFit()
+                                .padding(5)
+                        } else {
+                            Image(systemName: "fuelpump.fill")
+                                .font(.system(size: 22, weight: .semibold))
+                                .foregroundStyle(Color.black.opacity(0.82))
+                        }
+                    }
+                    .frame(width: 46, height: 46)
+                    .background(Circle().fill(Color.white))
+                    .clipShape(Circle())
+                    .overlay(Circle().stroke(Color.primary.opacity(0.10), lineWidth: 1))
+                    .shadow(color: .black.opacity(0.08), radius: 2, y: 1)
 
-            // MIDDLE — name, full address, distance
+                    favouriteButton
-            VStack(alignment: .leading, spacing: 2) {
+                }
-                HStack(spacing: 6) {
+
-                    Text(station.name)
+                // Name, full address, distance
-                        .font(.headline)
+                VStack(alignment: .leading, spacing: 2) {
-                        .lineLimit(1)
+                    // The name WRAPS instead of truncating: the row is tall
-                        .truncationMode(.tail)
+                    // enough now, and a name cut to "Z A Service Stat…" cannot
-                    ForEach(StationNotice.notices(for: station)) { notice in
+                    // be told apart from the station next door. Baseline
-                        Image(systemName: notice.symbolName)
+                    // alignment keeps the notice symbols on the name's FIRST
-                            .font(.caption2.weight(.semibold))
+                    // line instead of floating beside a two-line name.
-                            .foregroundStyle(.secondary)
+                    HStack(alignment: .firstTextBaseline, spacing: 6) {
-                            .accessibilityLabel(notice.title)
+                        Text(station.name)
+                            .font(.headline)
+                            .multilineTextAlignment(.leading)
+                            .fixedSize(horizontal: false, vertical: true)
+                        ForEach(StationNotice.notices(for: station)) { notice in
+                            Image(systemName: notice.symbolName)
+                                .font(.caption2.weight(.semibold))
+                                .foregroundStyle(.secondary)
+                                .accessibilityLabel(notice.title)
+                        }
+                    }
+                    // Wraps for the same reason as the name — addresses here run
+                    // to 70 characters at the 95th percentile.
+                    Text(StationAddressLine.display(address: station.address,
+                                                    postcode: station.postcode,
+                                                    name: station.name))
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                        .multilineTextAlignment(.leading)
+                        .fixedSize(horizontal: false, vertical: true)
+                    if let location {
+                        let distance = FuelStore.stationDistanceDisplay(
+                            station: station, userLat: location.lat, userLng: location.lng
+                        )
+                        // ONE-WAY distance: the listing shows how far the station
+                        // is. The return leg stays in the savings explanation, where
+                        // the extra travel it drives is actually costed.
+                        HStack(spacing: 3) {
+                            Image(systemName: "location.fill")
+                                .font(.caption2)
+                                .accessibilityHidden(true)
+                            Text(distance.label(unit: distanceUnit))
+                                .font(.caption2)
+                                .monospacedDigit()
+                        }
+                        .foregroundStyle(.secondary)
+                        .accessibilityElement(children: .ignore)
+                        .accessibilityLabel(distance.spokenLabel(unit: distanceUnit))
                     }
                 }
-                Text(StationAddressLine.display(address: station.address,
+                .frame(maxWidth: .infinity, alignment: .leading)
-                                                postcode: station.postcode,
-                                                name: station.name))
-                    .font(.caption)
-                    .foregroundStyle(.secondary)
-                    .lineLimit(1)
-                    .truncationMode(.tail)
-                if let location {
-                    let distance = FuelStore.stationDistanceDisplay(
-                        station: station, userLat: location.lat, userLng: location.lng
-                    )
-                    Text(distance.labelWithReturn(unit: distanceUnit))
-                        .font(.caption2)
-                        .foregroundStyle(.secondary)
-                        .monospacedDigit()
-                        .accessibilityLabel(distance.spokenLabelWithReturn(unit: distanceUnit))
-                }
             }
             .frame(maxWidth: .infinity, alignment: .leading)
+            .containerRelativeFrame(.horizontal, alignment: .leading) { length, _ in
+                length * Self.leftSectionShare
+            }
 
-            // RIGHT — price in £ (no p) + difference vs cheapest
+            // 1pt hairline between the two sections. Inset top and bottom so it
-            VStack(alignment: .trailing, spacing: 2) {
+            // spans the row's content without touching the row edges, and
-                if isTopResult {
+            // decorative: the columns are told apart by their content, and two
-                    // The badge always marks the CHEAPEST PUMP PRICE (never
+            // hairs per row would just be noise to VoiceOver.
-                    // "best saving"), so in Best Value order — where the
+            //
-                    // top row is the best net saving — it may sit lower down
+            // `secondary`, not `separator`: over a dark row fill the system
-                    // the list, and says so. It sits ABOVE the price it
+            // separator measures 7/255 brighter than the fill — measurably
-                    // annotates rather than beside the name, so it reads as
+            // invisible — while the mockup's rule sits ~112 above it. Secondary
-                    // part of the price and the name keeps its width.
+            // lands on the mockup's own value in both appearances.
-                    Text(topBadgeText)
+            Rectangle()
-                        .font(.caption2.bold())
+                .fill(Color.secondary)
-                        .padding(.horizontal, 5)
+                .frame(width: 1)
-                        .padding(.vertical, 1)
+                .frame(maxHeight: .infinity)
-                        .background(Capsule().fill(.blue.opacity(0.15)))
+                .padding(.vertical, 6)
-                        .foregroundStyle(.blue)
+                .accessibilityHidden(true)
-                        .lineLimit(1)
+
-                        .fixedSize()
+            // RIGHT SECTION — price and savings, every element leading-aligned on
+            // ONE axis. The 12pt row spacing plus this column's leading padding
+            // puts that axis ~22pt right of the hairline. (The mockup centres the
+            // price against the badge so its status dot hangs into the gutter; the
+            // redesign was explicitly asked not to do that.)
+            VStack(alignment: .leading, spacing: 12) {
+                if let badge = recommendationBadge {
+                    badgeCapsule(badge)
                 }
+                // 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()
                             .fill(ragColor)
                             .frame(width: 8, height: 8)
-                        FuelStore.priceTextAttributed(price, style: priceDisplayStyle, size: 20, weight: .bold)
+                        FuelStore.priceTextAttributed(price, style: priceDisplayStyle,
-                    }
+                                                     size: priceSize, weight: .bold)
-                    if let deltaText {
+                            .lineLimit(1)
-                        Text(deltaText)
+                            .minimumScaleFactor(0.8)
-                            .font(.caption2.bold().monospaced())
-                            .foregroundStyle(ragColor)
-                        if !isCheapestPrice {
-                            // "+8.0p" on its own never said what it measured
-                            // against; the delta is against the cheapest price
-                            // in range in EVERY sort mode.
-                            Text("vs cheapest")
-                                .font(.caption2)
-                                .foregroundStyle(.secondary)
-                                .lineLimit(1)
-                                .minimumScaleFactor(0.8)
-                        }
                     }
+                    // The visible "+1.8p vs cheapest" line is gone with the
+                    // redesign, so the comparison rides on the price's label.
+                    .accessibilityElement(children: .ignore)
+                    .accessibilityLabel(priceSpokenLabel(price))
+                }
+                if let result = fuelSavings?.result {
+                    savingsCapsule(result)
                 }
             }
-
+            .frame(maxWidth: .infinity, alignment: .leading)
-            // FAR RIGHT — favourite star
+            // The spec's ~20-24pt of air between the divider and the price
-            Button {
+            // column: the row's own 12pt spacing plus this 10pt.
-                onToggleFavourite()
+            .padding(.leading, 10)
-            } label: {
-                Image(systemName: isFavourite ? "star.fill" : "star")
-                    .foregroundStyle(isFavourite ? .yellow : .secondary)
-            }
-            .buttonStyle(.borderless)
-            }
-            if fuelSavings != nil {
-                // Full-width verdict banner under the row. Inline in the middle
-                // column it truncated ("Approx. £2.75 better off after tra…")
-                // because the
-                // price block squeezes that column — and the verdict is the
-                // point of this sort mode, so it gets its own line.
-                FuelSavingsSummaryView(
-                    availability: fuelSavings,
-                    amount: fuelSavingsAmount,
-                    baselineStationName: nil,
-                    compact: true,
-                    distanceUnit: distanceUnit
-                )
-            }
         }
         .contentShape(Rectangle())
         .onTapGesture(perform: handleTap)
         .onLongPressGesture(perform: showDetails)
     }
+
+    /// The favourite toggle, sitting under the station logo. Kept as its own view
+    /// so it stays a separate VoiceOver element — the price beside it is a single
+    /// grouped label — and keeps its own tap target inside the row's tap and
+    /// long-press gestures.
+    private var favouriteButton: some View {
+        Button {
+            onToggleFavourite()
+        } label: {
+            Image(systemName: isFavourite ? "star.fill" : "star")
+                .foregroundStyle(isFavourite ? .yellow : .secondary)
+        }
+        .buttonStyle(.borderless)
+    }
+
+    /// The savings capsule plus the comparison it is measured against. The
+    /// capsule itself is the shared verdict view, so a row, the detail sheet and
+    /// the compact summary cannot drift apart. The comparison label sits UNDER
+    /// the capsule, trailing-aligned with it, at every width — beside it, a long
+    /// verdict pushed the caption off the row and the pair no longer read as one
+    /// statement.
+    @ViewBuilder
+    private func savingsCapsule(_ result: FuelSavingsResult) -> some View {
+        VStack(alignment: .trailing, spacing: 2) {
+            FuelSavingsCapsule(result: result)
+            Text(FuelSavingsFormat.comparisonLabel(status: result.status))
+                .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)
+                .multilineTextAlignment(.trailing)
+        }
+    }
+
+    /// One recommendation badge, above the price it annotates. Tinted rather
+    /// than the mockup's solid fill, like every other badge and capsule in the
+    /// app: coloured text 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)
+            .font(.caption2.bold())
+            .foregroundStyle(badge.tint)
+            .padding(.horizontal, 7)
+            .padding(.vertical, 3)
+            .background(Capsule().fill(badge.tint.opacity(0.15)))
+            .lineLimit(1)
+            .fixedSize()
+    }
+}
+
+/// Badge copy and colour for `StationRecommendationBadge` — view concerns, so
+/// they stay out of the shared model the tests cover.
+private extension StationRecommendationBadge {
+    var title: String {
+        switch self {
+        case .bestValue:
+            return String(localized: "BEST VALUE", comment: "Station badge: saving clears the Best Value threshold")
+        case .cheapest:
+            return String(localized: "CHEAPEST", comment: "Station badge: cheapest price in range")
+        }
+    }
+
+    var tint: Color { self == .bestValue ? .green : .blue }
 }
 
 // MARK: - Location manager

FuelBoard/FavouritesView.swift

@@ -21,10 +21,9 @@ struct FavouritesView: View {
     /// still never touches the Settings default.
     let fuelSavingsSettings: FuelSavingsSettings
     @Binding var fuelSavingsAmount: FuelSavingsFillAmount
-    /// Estimated saving for a favourite, against the nearest eligible station —
+    /// Estimated saving for a favourite, against the closest station by
-    /// the same baseline and definition the Stations list uses.
+    /// journey distance — the same baseline and definition the Stations list uses.
     var savingsForStation: (FuelStation) -> FuelSavingsAvailability? = { _ in nil }
-    var savingsBaselineStationName: String?
     var journeyDiagnosticsForStation: (FuelStation) -> FuelSavingsJourneyDiagnostics? = { _ in nil }
     var onToggleFavourite: (FuelStation, FuelType) -> Void = { _, _ in }
     /// Persists a reordered favourites array (after drag-and-drop).
@@ -84,7 +83,6 @@ struct FavouritesView: View {
          fuelSavingsSettings: FuelSavingsSettings = .defaults,
          fuelSavingsAmount: Binding<FuelSavingsFillAmount>,
          savingsForStation: @escaping (FuelStation) -> FuelSavingsAvailability? = { _ in nil },
-         savingsBaselineStationName: String? = nil,
          journeyDiagnosticsForStation: @escaping (FuelStation) -> FuelSavingsJourneyDiagnostics? = { _ in nil },
          onToggleFavourite: @escaping (FuelStation, FuelType) -> Void = { _, _ in },
          onReorder: @escaping ([FavouriteEntry]) -> Void = { _ in },
@@ -99,7 +97,6 @@ struct FavouritesView: View {
         self.fuelSavingsSettings = fuelSavingsSettings
         _fuelSavingsAmount = fuelSavingsAmount
         self.savingsForStation = savingsForStation
-        self.savingsBaselineStationName = savingsBaselineStationName
         self.journeyDiagnosticsForStation = journeyDiagnosticsForStation
         self.onToggleFavourite = onToggleFavourite
         self.onReorder = onReorder
@@ -147,12 +144,9 @@ struct FavouritesView: View {
 
                     if fuelSavingsSettings.isConfigured {
                         Section {
-                            FuelSavingsAdjustmentView(
+                            FuelSavingsAdjustmentView(amount: $fuelSavingsAmount)
-                                amount: $fuelSavingsAmount,
-                                referencePricePencePerLitre: cheapestPrice
-                            )
                         } footer: {
-                            Text(String(localized: "Savings below are estimated against the nearest station with a price for this fuel — the same baseline as the Stations list.", comment: "Favourites fuel-savings explanation"))
+                            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"))
                         }
                     }
 
@@ -167,10 +161,8 @@ struct FavouritesView: View {
                                 baselinePrice: cheapestPrice,
                                 isTopResult: station.id == cheapest?.id,
                                 isFavourite: activeFuelFavouriteIDs.contains(station.id),
-                                topBadgeText: "CHEAPEST",
                                 tapAction: stationTapAction,
                                 fuelSavings: savingsForStation(station),
-                                fuelSavingsAmount: fuelSavingsAmount,
                                 onToggleFavourite: { onToggleFavourite(station, activeFuel) },
                                 onShowDetails: { detailStation = $0 }
                             )
@@ -219,9 +211,10 @@ struct FavouritesView: View {
                     station: station,
                     location: location,
                     distanceUnit: distanceUnit,
+                    priceStyle: priceDisplayStyle,
+                    selectedFuel: activeFuel,
                     fuelSavings: savingsForStation(station),
                     fuelSavingsAmount: fuelSavingsAmount,
-                    savingsBaselineStationName: savingsBaselineStationName,
                     journeyDiagnostics: journeyDiagnosticsForStation(station),
                     // Every station listed here IS a favourite for the tab's
                     // fuel, so the star starts filled; tapping it unstars.
@@ -229,6 +222,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/FuelSavingsViews.swift

@@ -2,7 +2,8 @@ import SwiftUI
 
 struct FuelSavingsAdjustmentView: View {
     @Binding var amount: FuelSavingsFillAmount
-    let referencePricePencePerLitre: Double?
+
+    @State private var unitChangeNotice: String?
 
     private var range: ClosedRange<Double> {
         FuelSavingsCalculator.fillAmountSliderRange(for: amount.unit)
@@ -44,6 +45,14 @@ struct FuelSavingsAdjustmentView: View {
             Text("Changes the estimate for this session only — your Settings default stays unchanged.")
                 .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)
+            }
         }
     }
 
@@ -52,12 +61,10 @@ struct FuelSavingsAdjustmentView: View {
             get: { amount.unit },
             set: { newUnit in
                 guard newUnit != amount.unit else { return }
-                if let referencePricePencePerLitre,
+                // No one litre figure equals a budget at every candidate price.
-                   let converted = try? FuelSavingsCalculator.convert(amount: amount, to: newUnit, referencePricePencePerLitre: referencePricePencePerLitre) {
+                // A unit change starts a new, explicitly labelled comparison.
-                    amount = converted
+                amount = FuelSavingsCalculator.newComparisonAmount(afterSwitching: amount, to: newUnit)
-                } else {
+                unitChangeNotice = "New comparison basis — adjust the \(newUnit.displayName) amount to your intended fill-up."
-                    amount = FuelSavingsFillAmount(value: newUnit == .pounds ? 40 : 30, unit: newUnit)
-                }
             }
         )
     }
@@ -70,145 +77,42 @@ struct FuelSavingsAdjustmentView: View {
     }
 }
 
-struct FuelSavingsSummaryView: View {
+/// The colour-coded verdict capsule shared by the station listing rows, the
-    let availability: FuelSavingsAvailability?
+/// detail sheet and the compact summary.
-    let amount: FuelSavingsFillAmount
+///
-    let baselineStationName: String?
+/// An HStack with an explicit spacing, NOT a Label: given the width to spare,
-    var compact: Bool = false
+/// a Label lays its icon and title out across the row and leaves a visible gap
-    /// Sizes the "extra return travel" caption in the user's own unit (the
+/// between them (22pt in the listing row), which read as the text having
-    /// stored figure is miles) — used by both the row banner and the detail sheet.
+/// drifted away from its symbol. The icon is decorative here — the verdict is
-    var distanceUnit: DistanceUnit = .miles
+/// in the text — so VoiceOver reads the capsule as one phrase.
+struct FuelSavingsCapsule: View {
+    let result: FuelSavingsResult
+    var compact: Bool = true
 
     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) {
-                    capsule(for: result, compact: true)
-                        .accessibilityLabel(accessibilityHeadline(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) {
-                    capsule(for: result, compact: false)
-                        .accessibilityLabel(accessibilityHeadline(for: result))
-                    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 with a price for this fuel — every other saving is measured against it.")
-                            .font(.caption)
-                            .foregroundStyle(.secondary)
-                    } else {
-                        Text("Compared with \(baselineStationName ?? "your nearest station") for \(amountText).").font(.caption).foregroundStyle(.secondary)
-                        LabeledContent("Fuel-price saving", value: FuelSavingsFormat.money(result.grossSavingGBP))
-                        LabeledContent("Extra driving cost", value: FuelSavingsFormat.money(result.extraDrivingCostGBP))
-                        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)
-                    }
-                }
-            }
-        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
-    /// estimated comparisons 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 — ONE implementation for the listing rows
-    /// and the detail sheet, so the verdict reads identically in both; the sheet
-    /// just gets the larger font and padding.
-    ///
-    /// 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 between them (22pt in the listing row), which read as the text having
-    /// drifted away from its symbol. The icon is decorative here — the verdict
-    /// is in the text — so VoiceOver reads the capsule as one phrase.
-    private func capsule(for result: FuelSavingsResult, compact: Bool) -> some View {
         HStack(spacing: compact ? 3 : 5) {
-            Image(systemName: symbol(for: result.status))
+            Image(systemName: Self.symbol(for: result.status))
                 .accessibilityHidden(true)
             Text(result.capsuleHeadline())
                 .lineLimit(1)
-                .minimumScaleFactor(0.8)
+                // Measured on a 393pt screen: the capsule is handed ~101pt, of
+                // which the icon, its spacing and the 8pt padding either side
+                // take 32pt, leaving ~69pt for the text. "Closest station" needs
+                // ~90pt at full size, so a 0.8 floor — 72pt — could not reach it
+                // and the row showed "Closest stati…" instead. 0.7 leaves ~63pt,
+                // which clears it at ~10pt type: scaled, never truncated.
+                .minimumScaleFactor(0.7)
         }
         .font(compact ? .caption.weight(.semibold) : .headline)
-        .foregroundStyle(capsuleColor(for: result.status))
+        .foregroundStyle(Self.color(for: result.status))
         .padding(.horizontal, compact ? 8 : 12)
         .padding(.vertical, compact ? 4 : 7)
-        .background(Capsule().fill(capsuleColor(for: result.status).opacity(0.15)))
+        .background(Capsule().fill(Self.color(for: result.status).opacity(0.15)))
     }
 
     /// Verdict colour: green save, red worse off, grey break even, blue
     /// baseline — the same green/amber/red family the price dot already uses.
-    private func capsuleColor(for status: FuelSavingsStatus) -> Color {
+    static func color(for status: FuelSavingsStatus) -> Color {
         switch status {
         case .worthTheDrive: return .green
         case .notWorthTheDrive: return .red
@@ -217,7 +121,7 @@ struct FuelSavingsSummaryView: View {
         }
     }
 
-    private func symbol(for status: FuelSavingsStatus) -> String {
+    static func symbol(for status: FuelSavingsStatus) -> String {
         switch status {
         case .worthTheDrive: return "checkmark.circle.fill"
         case .breakEven: return "equal.circle.fill"

FuelBoard/HowBestValueSheet.swift

@@ -0,0 +1,153 @@
+import SwiftUI
+
+/// The "How Best Value works" explanation as its own sheet.
+///
+/// It used to sit inline in the Key sheet as a `Section`; it is one shared view
+/// now so the Key sheet and the More info sheet can both open it, and the copy is
+/// unchanged (the same `Localizable.strings` keys are reused — the old section
+/// header string is the sheet's title).
+struct HowBestValueSheet: View {
+    @Environment(\.dismiss) private var dismiss
+
+    var body: some View {
+        NavigationStack {
+            List {
+                Section {
+                    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.")
+                            .foregroundStyle(.secondary)
+                    }
+                    .font(.subheadline)
+                    .padding(.vertical, 4)
+                }
+            }
+            .navigationTitle("How Best Value works")
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .confirmationAction) {
+                    Button("Done") { dismiss() }
+                }
+            }
+        }
+        .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)
+        }
+    }
+}
+
+/// The row that opens `HowBestValueSheet`. A tappable row with a chevron, like
+/// the other rows in both sheets. `.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 HowBestValueRow: View {
+    let action: () -> Void
+
+    var body: some View {
+        Button(action: action) {
+            HStack(spacing: 8) {
+                Text("How Best Value works")
+                Spacer(minLength: 8)
+                Image(systemName: "chevron.forward")
+                    .font(.footnote.weight(.semibold))
+                    .foregroundStyle(.tertiary)
+            }
+        }
+        .buttonStyle(.plain)
+    }
+}
+
+#if DEBUG
+/// QA hook support: `-showBestValueInfo` opens this sheet without a tap, so it can
+/// be screenshotted (simctl has no tap command) — the same pattern as
+/// `-showKeySheet` / `-showDetail`.
+enum BestValueInfoQA {
+    static var isRequested: Bool {
+        ProcessInfo.processInfo.arguments.contains("-showBestValueInfo")
+    }
+}
+#endif

FuelBoard/LiveActivityManager.swift

@@ -79,7 +79,7 @@ enum LiveActivityManager {
                 currentStartDate = nil
                 start(attributes: attributes, state: state)
             } else {
-                Task { await current.update(using: state) }
+                Task { await current.update(ActivityContent(state: state, staleDate: nil)) }
             }
         } else {
             start(attributes: attributes, state: state)

FuelBoard/OnboardingView.swift

@@ -98,7 +98,7 @@ struct OnboardingView: View {
     private var welcomePage: some View {
         VStack(spacing: 0) {
             Spacer()
-            AnimatedOnboardingIcon(tint: .accentColor) {
+            AnimatedOnboardingIcon(tint: .accentColor, showsHalo: false) {
                 // The app icon itself, with the standard iOS rounded-corner
                 // treatment (~22% of the size), so onboarding matches the
                 // Home Screen.
@@ -108,9 +108,9 @@ struct OnboardingView: View {
                     .frame(width: 96, height: 96)
                     .clipShape(RoundedRectangle(cornerRadius: 21, style: .continuous))
             }
-            .padding(.bottom, 28)
+            .padding(.bottom, 16)
 
-            Text(String(localized: "Welcome to FuelBoard", comment: "Onboarding welcome title"))
+            Text(String(localized: "Welcome to\nFuelBoard", comment: "Onboarding welcome title"))
                 .font(.largeTitle.bold())
                 .multilineTextAlignment(.center)
 
@@ -121,12 +121,13 @@ struct OnboardingView: View {
                 .padding(.horizontal, 32)
                 .padding(.top, 12)
 
-            featureRow(icon: "globe.europe.africa.fill", text: String(localized: "UK-wide prices — 8,000+ stations, updated twice a day", comment: "Onboarding feature row"))
+            featureRow(icon: "map.fill", title: String(localized: "Compare fuel prices near you", comment: "Onboarding feature row title"), subtitle: String(localized: "Over 8,000 stations across Great Britain, with prices updated daily.", comment: "Onboarding feature row subtitle"))
-            featureRow(icon: "scope", text: String(localized: "Cheapest within your chosen radius, or closest station first", comment: "Onboarding feature row"))
+            
-            featureRow(icon: "star.fill", text: String(localized: "Favourites with instant price comparison", comment: "Onboarding feature row"))
+            featureRow(icon: "chart.line.uptrend.xyaxis", title: String(localized: "See how much you could save", comment: "Onboarding feature row title"), subtitle: String(localized: "Compare fill-up costs and potential savings at different stations.", comment: "Onboarding feature row subtitle"))
-            featureRow(icon: "chart.bar.fill", text: String(localized: "Green/amber/red rating vs the best nearby price", comment: "Onboarding feature row"))
+            
-            featureRow(icon: "square.grid.2x2.fill", text: String(localized: "Home-screen widget showing the cheapest nearby", comment: "Onboarding feature row"))
+            featureRow(icon: "car.fill", title: String(localized: "Know if it's worth the drive", comment: "Onboarding feature row title"), subtitle: String(localized: "Factor in your journey and fuel costs to find the best value.", comment: "Onboarding feature row subtitle"))
-            featureRow(icon: "bell.fill", text: String(localized: "Alerts when you approach the cheapest station", comment: "Onboarding feature row"))
+            
+            featureRow(icon: "star.fill", title: String(localized: "Keep your favourites close", comment: "Onboarding feature row title"), subtitle: String(localized: "Save stations and quickly compare their latest prices.", comment: "Onboarding feature row subtitle"))
 
             Spacer()
         }
@@ -155,7 +156,7 @@ struct OnboardingView: View {
             permissionStatusLabel(
                 granted: prompter.locationGranted,
                 denied: prompter.locationDenied,
-                deniedText: String(localized: "Location was denied. You can still browse all stations, but \"nearest\" sorting needs it.", comment: "Onboarding location denied text")
+                deniedText: String(localized: "Location was denied. You can still browse all stations, but \"closest\" sorting needs it.", comment: "Onboarding location denied text")
             )
             .padding(.top, 24)
 
@@ -298,18 +299,23 @@ struct OnboardingView: View {
         OnboardingPrimaryButton(title: title, action: action)
     }
 
-    private func featureRow(icon: String, text: String) -> some View {
+    private func featureRow(icon: String, title: String, subtitle: String) -> some View {
-        HStack(spacing: 12) {
+        HStack(alignment: .top, spacing: 12) {
             Image(systemName: icon)
                 .font(.system(size: 20, weight: .semibold))
                 .foregroundStyle(Color.accentColor)
                 .frame(width: 32)
-            Text(text)
+            VStack(alignment: .leading, spacing: 2) {
-                .font(.subheadline)
+                Text(title)
+                    .font(.subheadline.bold())
+                Text(subtitle)
+                    .font(.subheadline)
+                    .foregroundStyle(.secondary)
+            }
             Spacer(minLength: 0)
         }
         .padding(.horizontal, 36)
-        .padding(.vertical, 10)
+        .padding(.vertical, 8)
     }
 
     private func permissionStatusLabel(granted: Bool, denied: Bool, deniedText: String) -> some View {
@@ -393,6 +399,9 @@ struct AnimatedOnboardingIcon<Content: View>: View {
 
     let tint: Color
     var motion: Motion = .gentle
+    /// The soft circle behind the glyph. The welcome page turns it off: it shows
+    /// the app icon itself and reads better with no container around it.
+    var showsHalo: Bool = true
     @ViewBuilder var content: Content
 
     @State private var settled = false
@@ -402,16 +411,18 @@ struct AnimatedOnboardingIcon<Content: View>: View {
 
     var body: some View {
         ZStack {
-            Circle()
+            if showsHalo {
-                .fill(tint.opacity(0.10))
+                Circle()
-                .frame(width: 108, height: 108)
+                    .fill(tint.opacity(0.10))
-                .scaleEffect(settled ? 1.0 : 0.94)
+                    .frame(width: 108, height: 108)
+                    .scaleEffect(settled ? 1.0 : 0.94)
 
-            Circle()
+                Circle()
-                .stroke(tint.opacity(0.18), lineWidth: 1)
+                    .stroke(tint.opacity(0.18), lineWidth: 1)
-                .frame(width: 118, height: 118)
+                    .frame(width: 118, height: 118)
-                .scaleEffect(settled ? 1.03 : 0.97)
+                    .scaleEffect(settled ? 1.03 : 0.97)
-                .opacity(settled ? 1.0 : 0.55)
+                    .opacity(settled ? 1.0 : 0.55)
+            }
 
             content
                 .scaleEffect(iconScale)

FuelBoard/ProximityMonitor.swift

@@ -618,7 +618,7 @@ final class ProximityMonitor: NSObject, ObservableObject, @preconcurrency CLLoca
         let content = UNMutableNotificationContent()
         content.sound = .default
         content.title = "Best Value \(fuel.displayName) nearby: \(brand)"
-        content.body = "\(station.name) could leave you \(result.headline()). Tap for directions."
+        content.body = "\(station.name): \(result.headline()). Tap for directions."
         addAlertRequest(content: content, station: station)
         logAlert(.fired, "Best Value alert scheduled — \(brand) · \(result.headline())")
         lastAlert = "Best Value · \(brand) · \(result.headline())"
@@ -923,7 +923,7 @@ final class ProximityMonitor: NSObject, ObservableObject, @preconcurrency CLLoca
         content.sound = .default
         let brand = candidate.station.brand.isEmpty ? candidate.station.name : candidate.station.brand
         content.title = "Best Value \(fuel.displayName) nearby: \(brand)"
-        content.body = "\(candidate.station.name) could leave you \(candidate.result.headline()). Tap for directions."
+        content.body = "\(candidate.station.name): \(candidate.result.headline()). Tap for directions."
         let baseResult = "Best Value · \(brand) · \(candidate.result.headline()) · radius \(unit.format(radiusKM))"
         lastTestResult = baseResult
         logAlert(.fired, "Best Value test alert scheduled — \(brand) · \(candidate.result.headline())")

FuelBoard/RoadDistanceService.swift

@@ -13,6 +13,7 @@
 // every row at once; the mode must also be ON for any pass to run at all.
 
 import Foundation
+import CoreLocation
 import MapKit
 import UIKit
 import WidgetKit
@@ -131,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,
@@ -407,8 +408,14 @@ enum RoadDistanceService {
     /// Driving distance (metres) between two coordinates via Apple Maps routing.
     private static func roadMeters(from: CLLocationCoordinate2D, to: CLLocationCoordinate2D) async -> Double? {
         let request = MKDirections.Request()
-        request.source = MKMapItem(placemark: MKPlacemark(coordinate: from))
+        request.source = MKMapItem(
-        request.destination = MKMapItem(placemark: MKPlacemark(coordinate: to))
+            location: CLLocation(latitude: from.latitude, longitude: from.longitude),
+            address: nil
+        )
+        request.destination = MKMapItem(
+            location: CLLocation(latitude: to.latitude, longitude: to.longitude),
+            address: nil
+        )
         request.transportType = .automobile
         request.requestsAlternateRoutes = false
         do {

FuelBoard/SettingsView.swift

@@ -20,6 +20,12 @@ struct SettingsView: View {
     @Binding var priceDisplayStyle: PriceDisplayStyle
     @Binding var stationTapAction: StationTapAction
     @Binding var fuelSavingsSettings: FuelSavingsSettings
+    /// The Best Value gate — the net saving that makes a station worth the trip.
+    /// Edited here, with the fill size and MPG that PRODUCE that saving, rather
+    /// than in the Alerts tab: the same figure also decides which station rows
+    /// carry the BEST VALUE badge, so it is a fuel-savings setting first and an
+    /// alert setting second. Stored under the alerts key either way.
+    @Binding var bestValueThresholdGBP: Double
     @Binding var dataRefreshMode: DataRefreshMode
     /// The fuel + radius currently configured for alerts (mirrors the Alerts
     /// tab) so the test notification matches what real alerts will say.
@@ -64,9 +70,16 @@ 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
     /// Widget diagnostics: the extension's last makeEntry beacon PER intent
@@ -110,6 +123,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
@@ -125,11 +141,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)
@@ -137,20 +162,39 @@ 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)
+                            }
+                        }
+                        // Persisted by ContentView's single
+                        // `.onChange(of: alertsBestValueThresholdGBP)`, which
+                        // also refreshes the alert monitor — so this picker
+                        // needs no handler of its own. The store snaps to the
+                        // nearest option, so the picker and the stored value
+                        // cannot disagree.
+                        Text("The smallest saving you'd consider worth the extra drive.")
+                            .font(.footnote)
+                            .foregroundStyle(.secondary)
                         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)
                         }
                     }
@@ -158,7 +202,7 @@ struct SettingsView: View {
                 } 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 {
@@ -173,6 +217,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)
@@ -184,24 +231,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 {
@@ -214,10 +263,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 {
@@ -234,14 +284,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 {
@@ -250,8 +298,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 {
@@ -285,7 +334,7 @@ struct SettingsView: View {
                     } header: {
                         Text("Debug")
                     } footer: {
-                        Text("The first button applies the real criteria — cheapest \(alertsFuel.displayName.lowercased()) station within \(distanceUnit.format(alertsRadiusKM)) of you — and sends the actual station's name, price and coordinates. The second fires with no criteria at all (nearest seller), still carrying a real station, just to verify a notification appears and tapping it opens directions. Cheapest in range mirrors the app list (selected fuel + distance); the in-range count mirrors the alert radius.")
+                        Text("The first button applies the real criteria — cheapest \(alertsFuel.displayName.lowercased()) station within \(distanceUnit.format(alertsRadiusKM)) of you — and sends the actual station's name, price and coordinates. The second fires with no criteria at all (closest seller), still carrying a real station, just to verify a notification appears and tapping it opens directions. Cheapest in range mirrors the app list (selected fuel + distance); the in-range count mirrors the alert radius.")
                     }
                     .onAppear { onRefreshDebugStatus() }
 
@@ -428,7 +477,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 {
@@ -684,57 +733,96 @@ 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 },
             set: { newUnit in
-                fuelSavingsSettings.preferredAmount.unit = newUnit
+                guard newUnit != fuelSavingsSettings.preferredAmount.unit else { return }
-                if !fuelSavingsSettings.preferredAmount.isValid {
+                fuelSavingsSettings.preferredAmount = FuelSavingsCalculator.newComparisonAmount(
-                    fuelSavingsSettings.preferredAmount.value = newUnit == .pounds ? 40 : 30
+                    afterSwitching: fuelSavingsSettings.preferredAmount, to: newUnit)
-                }
+                // 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
             }
         )
     }
 
-    /// "45 MPG" / "45.5 MPG". The slider is the only control, so this read-out
+    /// Describes the fill-up amount in the unit the user picked, so the copy stays
-    /// is the one place the figure is stated.
+    /// true whether the amount is a budget in pounds or a volume in litres.
-    private var mpgText: String {
+    private var fillUpAmountDescription: String {
-        let mpg = 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.
-    private var fillUpText: String {
         switch fuelSavingsSettings.preferredAmount.unit {
-        case .pounds: return String(format: "£%.0f", fuelSavingsSettings.preferredAmount.value)
+        case .pounds: return "How much you plan to spend on fuel."
-        case .litres: return String(format: "%.0f L", fuelSavingsSettings.preferredAmount.value)
+        case .litres: return "How many litres you usually buy."
         }
     }
 
-    private func persistFuelSavingsSettings() {
+    /// "45 MPG" / "45.5 MPG". The slider is the only control, so this read-out
-        FuelStore.saveFuelSavingsSettings(fuelSavingsSettings)
+    /// is the one place the figure is stated. It follows the draft while the
+    /// thumb is down.
+    private var mpgText: String {
+        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, 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", value)
+        case .litres: return String(format: "%.0f L", value)
+        }
     }
 
     /// "API" when the relay is serving the official Fuel Finder API, "CSV"

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.spokenHeadline())
+                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,11 @@ 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
     var fuelSavingsAmount: FuelSavingsFillAmount = FuelSavingsSettings.defaultPreferredAmount
     var savingsBaselineStationName: String? = nil
@@ -29,10 +34,13 @@ struct StationDetailView: View {
     var onToggleFavourite: (() -> Void)? = nil
     @Environment(\.dismiss) private var dismiss
     @State private var showingReportIssueConfirmation = false
-    /// Transient "Copied" confirmation on the Address row. Cleared by a task so
+    /// Transient "Postcode copied" confirmation on the Address row. Cleared by a task so
     /// the caption fades out on its own.
     @State private var showingCopied = false
     @State private var copyResetTask: Task<Void, Never>?
+    /// The "How Best Value works" sheet, opened from the row at the bottom of the
+    /// Best Value card (the Key sheet opens the same shared view).
+    @State private var showBestValueInfo = false
 
     private let reportIssueURL = URL(string: "https://www.gov.uk/guidance/report-an-error-in-fuel-prices-or-forecourt-details")!
 
@@ -54,6 +62,84 @@ struct StationDetailView: View {
         station.postcode.trimmingCharacters(in: .whitespacesAndNewlines)
     }
 
+    private var priceFreshness: FuelPriceFreshness.Assessment {
+        FuelPriceFreshness.assessment(for: station)
+    }
+
+    /// One-way and out-and-back distance from the current location, from the ONE
+    /// shared display helper — so this sheet's figures carry the same confidence
+    /// marker as the listing row, the widget and the Live Activity.
+    private var distanceDisplay: StationDistanceDisplay? {
+        guard let location else { return nil }
+        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
     /// URL) the Directions button below uses, so the map and the button can
     /// never point at two different places.
@@ -73,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 }
         }
@@ -82,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.
                     //
@@ -123,77 +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 "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("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()
-                    }
                     ForEach(StationNotice.notices(for: station)) { notice in
                         Label(notice.title, systemImage: notice.symbolName)
                             .font(.subheadline.weight(.semibold))
@@ -202,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: {
@@ -230,15 +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
                         )
-                    } 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 }
                     }
                 }
 
@@ -255,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") {
@@ -265,6 +352,8 @@ struct StationDetailView: View {
             } message: {
                 Text("Are you sure you want to report an error in fuel prices or forecourt details? This will open in your chosen browser.")
             }
+            // Nested sheet: the More info sheet stays put behind the explanation.
+            .sheet(isPresented: $showBestValueInfo) { HowBestValueSheet() }
             .toolbar {
                 ToolbarItem(placement: .cancellationAction) {
                     Button("Done") { dismiss() }
@@ -284,18 +373,21 @@ struct StationDetailView: View {
                     )
                 }
             }
-            // The "Copied" fade-out task must not outlive the sheet.
+            // The "Postcode copied" fade-out task must not outlive the sheet.
             .onDisappear { copyResetTask?.cancel() }
 #if DEBUG
             // QA hook: `-qaCopyPostcode` runs the REAL copy on open, so the
             // clipboard value (read back with `xcrun simctl pbpaste`) and the
-            // "Copied" confirmation can be verified without a tap — simctl
+            // "Postcode copied" confirmation can be verified without a tap — simctl
             // cannot drive taps into the Simulator.
             .task {
                 guard ProcessInfo.processInfo.arguments.contains("-qaCopyPostcode") else { return }
                 copyPostcode()
             }
 #endif
+            }
+            // Closes the ScrollViewReader wrapped around the List: kept last so
+            // every List modifier above stays inside `proxy`'s scope.
         }
     }
 }

FuelBoard/StationPriceAgeView.swift

@@ -0,0 +1,46 @@
+import SwiftUI
+
+/// The More info sheet's price-age row.
+///
+/// Station-level by design: the relay publishes a single `price_updated` per
+/// station (the newest grade it maps), so the copy says "Price updated" and
+/// never claims the selected grade itself was updated.
+///
+/// Past `FuelPriceFreshness.outdatedAge` a discreet note flags the information
+/// as possibly out of date. It is informational only — it gates nothing, and
+/// the station's own price row above it is unaffected.
+///
+/// Its own view rather than inlined into `StationDetailView`: that body sits at
+/// the compiler's type-checking limit, so one extra statement there fails the
+/// build. One statement here, one there.
+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)
+                    .foregroundStyle(.secondary)
+                    .accessibilityLabel(notice)
+            }
+        }
+    }
+}

FuelBoard/StationsView.swift

@@ -19,7 +19,6 @@ struct StationsView: View {
     let fuelSavingsSettings: FuelSavingsSettings
     @Binding var fuelSavingsAmount: FuelSavingsFillAmount
     var savingsForStation: (FuelStation) -> FuelSavingsAvailability? = { _ in nil }
-    var savingsBaselineStationName: String?
     var journeyDiagnosticsForStation: (FuelStation) -> FuelSavingsJourneyDiagnostics? = { _ in nil }
     var onToggleFavourite: (FuelStation, FuelType) -> Void = { _, _ in }
     var onRefresh: () async -> Void = {}
@@ -35,6 +34,11 @@ struct StationsView: View {
     /// info button in the header — keeps the list focused on stations.
     @State private var showKey = false
 
+    /// The "How Best Value works" sheet. The explanation used to be a section in
+    /// the Key sheet; it is its own sheet now, opened from a row at the bottom of
+    /// the Key sheet and from the More info sheet.
+    @State private var showBestValueInfo = false
+
     /// Station picked for the More-info sheet (tap action = showDetails).
     @State private var detailStation: FuelStation?
 
@@ -63,7 +67,7 @@ struct StationsView: View {
         }
         if location != nil {
             if sortMode == .closest {
-                return "\(mode) \(fuel) stations — nearest first, best value within \(miles) \(unit) · \(ratio) stations updated"
+                return "\(mode) \(fuel) stations — closest first, lowest price within \(miles) \(unit) · \(ratio) stations updated"
             }
             return "\(mode) \(fuel) within \(miles) \(unit) — \(ratio) stations updated · \(tapHint)"
         }
@@ -89,7 +93,7 @@ struct StationsView: View {
                     }
                     .pickerStyle(.segmented)
                     // In Closest mode the whole country is the pool — the
-                    // radius is meaningless ("nearest" must never return an
+                    // radius is meaningless ("closest" must never return an
                     // empty state), so the picker is disabled but its value is
                     // kept for when the user switches back to Cheapest.
                     .disabled(sortMode == .closest)
@@ -116,10 +120,7 @@ struct StationsView: View {
                     // stale stored sort mode must not keep the control on screen
                     // for a switched-off feature.
                     if sortMode == .worthTheDrive && fuelSavingsSettings.isConfigured {
-                        FuelSavingsAdjustmentView(
+                        FuelSavingsAdjustmentView(amount: $fuelSavingsAmount)
-                            amount: $fuelSavingsAmount,
-                            referencePricePencePerLitre: baselinePrice
-                        )
                     }
 
                     if isLoading && stations.isEmpty {
@@ -144,22 +145,7 @@ struct StationsView: View {
                         .padding(.vertical, 4)
                     } else {
                         ForEach(Array(stations.prefix(visibleCount)), id: \.id) { station in
-                            StationRow(
+                            stationRow(station)
-                                station: station,
-                                fuel: selectedFuel,
-                                location: location,
-                                distanceUnit: distanceUnit,
-                                priceDisplayStyle: priceDisplayStyle,
-                                baselinePrice: baselinePrice,
-                                isTopResult: station.id == topStationID,
-                                isFavourite: favouriteIDs.contains(station.id),
-                                topBadgeText: sortMode == .worthTheDrive ? "CHEAPEST" : "TOP",
-                                tapAction: stationTapAction,
-                                fuelSavings: savingsForStation(station),
-                                fuelSavingsAmount: fuelSavingsAmount,
-                                onToggleFavourite: { onToggleFavourite(station, selectedFuel) },
-                                onShowDetails: { detailStation = $0 }
-                            )
                         }
 
                         if visibleCount < stations.count {
@@ -218,8 +204,29 @@ struct StationsView: View {
                 if ProcessInfo.processInfo.arguments.contains("-showKeySheet") {
                     showKey = true
                 }
+                // QA hook: `-showBestValueInfo` opens the Key sheet and then the
+                // explanation on top of it, so the copy can be screenshotted
+                // without a tap. It has to chain: the explanation's `.sheet` lives
+                // inside the Key sheet's content, so it cannot present while the
+                // Key sheet is shut.
+                if BestValueInfoQA.isRequested {
+                    showKey = true
+                    Task { @MainActor in
+                        try? await Task.sleep(nanoseconds: 1_200_000_000)
+                        showBestValueInfo = 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
@@ -243,21 +250,45 @@ struct StationsView: View {
                 }
             }
             .sheet(isPresented: $showKey) {
+                keySheet
+            }
+            .sheet(item: $detailStation) { station in
+                detailSheet(for: station)
+            }
+        }
+    }
+
+    private func detailSheet(for station: FuelStation) -> some View {
+        StationDetailView(
+            station: station,
+            location: location,
+            distanceUnit: distanceUnit,
+            priceStyle: priceDisplayStyle,
+            selectedFuel: selectedFuel,
+            fuelSavings: savingsForStation(station),
+            fuelSavingsAmount: fuelSavingsAmount,
+            journeyDiagnostics: journeyDiagnosticsForStation(station),
+            isFavourite: favouriteIDs.contains(station.id),
+            onToggleFavourite: { onToggleFavourite(station, selectedFuel) }
+        )
+    }
+
+    private var keySheet: some View {
                 NavigationStack {
                     List {
                         Section {
                             VStack(spacing: 10) {
                                 keyCard(
                                     icon: "checkmark.circle.fill", color: .green,
-                                    title: "Best value", blurb: "Within 1.5p of the cheapest",
+                                    title: "Good price", blurb: "Within 1.5p of the cheapest",
-                                    threshold: "≤1.5p")
+                                    threshold: "0–1.5p")
                                 keyCard(
                                     icon: "equal.circle.fill", color: .orange,
-                                    title: "Okay", blurb: "Within 4p of the cheapest",
+                                    title: "Okay", blurb: "More than 1.5p, up to 4p above the cheapest",
-                                    threshold: "≤4p")
+                                    threshold: ">1.5–4p")
                                 keyCard(
                                     icon: "exclamationmark.circle.fill", color: .red,
-                                    title: "Pricey", blurb: "More than 4p over the cheapest",
+                                    title: "Pricey", blurb: "More than 4p above the cheapest",
                                     threshold: ">4p")
                                 Rectangle()
                                     .fill(Color(.separator))
@@ -289,15 +320,27 @@ struct StationsView: View {
                                 .padding(.horizontal, 14)
                                 .padding(.vertical, 12)
                                 .keyCardFill(color: .yellow)
-                                Text("Colours match each station's rating on the list")
+                                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)
+                                    .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)
@@ -306,24 +349,28 @@ struct StationsView: View {
                             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))
-            }
+    }
-            .sheet(item: $detailStation) { station in
+
-                StationDetailView(
+    private func stationRow(_ station: FuelStation) -> some View {
-                    station: station,
+        StationRow(
-                    location: location,
+            station: station,
-                    distanceUnit: distanceUnit,
+            fuel: selectedFuel,
-                    fuelSavings: savingsForStation(station),
+            location: location,
-                    fuelSavingsAmount: fuelSavingsAmount,
+            distanceUnit: distanceUnit,
-                    savingsBaselineStationName: savingsBaselineStationName,
+            priceDisplayStyle: priceDisplayStyle,
-                    journeyDiagnostics: journeyDiagnosticsForStation(station),
+            baselinePrice: baselinePrice,
-                    isFavourite: favouriteIDs.contains(station.id),
+            isTopResult: station.id == topStationID,
-                    onToggleFavourite: { onToggleFavourite(station, selectedFuel) }
+            isFavourite: favouriteIDs.contains(station.id),
-                )
+            tapAction: stationTapAction,
-            }
+            fuelSavings: savingsForStation(station),
-        }
+            onToggleFavourite: { onToggleFavourite(station, selectedFuel) },
+            onShowDetails: { detailStation = $0 }
+        )
     }
 
     private var availableSortModes: [SortMode] {
@@ -347,6 +394,7 @@ struct StationsView: View {
                 Text(LocalizedStringKey(blurb))
                     .font(.caption)
                     .foregroundStyle(.secondary)
+                    .fixedSize(horizontal: false, vertical: true)
             }
             Spacer(minLength: 8)
             HStack(spacing: 6) {

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/WidgetMockScreen.swift

@@ -76,7 +76,7 @@ struct WidgetMockScreen: View {
         let location = FuelStore.loadLocation().map { Coordinate(lat: $0.lat, lng: $0.lng) }
         // 5 miles — the widget config's default Distance. WidgetDistance itself
         // lives in the widget target, so the preview mirrors its default here.
-        let radiusKM = 5 * 1.60934
+        let radiusKM = 5 * FuelSavingsCalculator.kilometresPerMile
         let all = FuelStore.loadStations()
         let selling = all.filter { station in
             guard station.prices[fuel] != nil else { return false }
@@ -94,7 +94,8 @@ struct WidgetMockScreen: View {
             isFavourites: false,
             location: location,
             locationSource: location != nil ? "live" : "none",
-            unit: FuelStore.loadDistanceUnit()
+            unit: FuelStore.loadDistanceUnit(),
+            bestValueResult: nil
         )
     }
 }

FuelBoard/en.lproj/Localizable.strings

@@ -10,9 +10,11 @@
 "Settings" = "Settings";
 "FuelBoard" = "FuelBoard";
 "TOP" = "TOP";
+"BEST VALUE" = "BEST VALUE";
+"CHEAPEST" = "CHEAPEST";
 
 /* Stations tab */
-"Closest %@ stations — nearest first, best value within %lld %@ · %lld stations" = "Closest %@ stations — nearest first, best value within %lld %@ · %lld stations";
+"Closest %@ stations — closest first, lowest price within %lld %@ · %lld stations" = "Closest %@ stations — closest first, lowest price within %lld %@ · %lld stations";
 "Cheapest %@ within %lld %@ — %lld stations · tap a station for directions." = "Cheapest %@ within %lld %@ — %lld stations · tap a station for directions.";
 "%@ %@ — tap a station for directions." = "%@ %@ — tap a station for directions.";
 "Fuel type" = "Fuel type";
@@ -23,18 +25,25 @@
 "Show %lld more (%lld remaining)" = "Show %lld more (%lld remaining)";
 "All %lld stations shown" = "All %lld stations shown";
 "Key" = "Key";
-"Best value" = "Best value";
+"Good price" = "Good price";
 "Within 1.5p of the cheapest" = "Within 1.5p of the cheapest";
 "Okay" = "Okay";
-"Within 4p of the cheapest" = "Within 4p of the cheapest";
+"More than 1.5p, up to 4p above the cheapest" = "More than 1.5p, up to 4p above the cheapest";
 "Pricey" = "Pricey";
-"More than 4p over the cheapest" = "More than 4p over the cheapest";
+"More than 4p above the cheapest" = "More than 4p above the cheapest";
 "Top result for the current sort" = "Top result for the current sort";
 "Star a station to add it to Favourites" = "Star a station to add it to Favourites";
 /* Star button in the More info sheet heading (accessibility labels) */
 "Add to favourites" = "Add to favourites";
 "Remove from favourites" = "Remove from favourites";
-"Colours match each station's rating on the list" = "Colours match each station's rating on the list";
+"Price differences are shown in pence per litre (p/litre). Colours match each station's rating on the list." = "Price differences are shown in pence per litre (p/litre). Colours match each station's rating on the list.";
+"How Best Value works" = "How Best Value works";
+"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.";
+"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.";
 
 /* Favourites tab */
 "No favourites yet" = "No favourites yet";
@@ -58,26 +67,37 @@
 /* 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";
 "Address" = "Address";
-"Distance" = "Distance";
-"Copied" = "Copied";
 "Copies the postcode" = "Copies the postcode";
+"Postcode copied" = "Postcode copied";
 "Address: %@" = "Address: %@";
 "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";
-"The first button applies the real criteria — cheapest %@ station within %@ of you — and sends the actual station's name, price and coordinates. The second fires with no criteria at all (nearest seller), still carrying a real station, just to verify a notification appears and tapping it opens directions. Cheapest in range mirrors the app list (selected fuel + distance); the in-range count mirrors the alert radius." = "The first button applies the real criteria — cheapest %@ station within %@ of you — and sends the actual station's name, price and coordinates. The second fires with no criteria at all (nearest seller), still carrying a real station, just to verify a notification appears and tapping it opens directions. Cheapest in range mirrors the app list (selected fuel + distance); the in-range count mirrors the alert radius.";
+"The first button applies the real criteria — cheapest %@ station within %@ of you — and sends the actual station's name, price and coordinates. The second fires with no criteria at all (closest seller), still carrying a real station, just to verify a notification appears and tapping it opens directions. Cheapest in range mirrors the app list (selected fuel + distance); the in-range count mirrors the alert radius." = "The first button applies the real criteria — cheapest %@ station within %@ of you — and sends the actual station's name, price and coordinates. The second fires with no criteria at all (closest seller), still carrying a real station, just to verify a notification appears and tapping it opens directions. Cheapest in range mirrors the app list (selected fuel + distance); the in-range count mirrors the alert radius.";
 "Widget Diagnostics" = "Widget Diagnostics";
 "Each beacon is written by the widget extension at the end of every timeline entry for that intent type (keychain, so it survives free-SideStore installs). A missing SMALL beacon after adding the small widget means its timeline never reaches the provider. Installed widgets come from WidgetCenter." = "Each beacon is written by the widget extension at the end of every timeline entry for that intent type (keychain, so it survives free-SideStore installs). A missing SMALL beacon after adding the small widget means its timeline never reaches the provider. Installed widgets come from WidgetCenter.";
 "SMALL: %@" = "SMALL: %@";
@@ -135,7 +155,7 @@
 "Connection shows the source of the current prices (CSV mirror or API). Data updated is the latest price change reported by the GOV.UK server itself. Prices use the UK Fuel Finder dataset (Open Government Licence) and refresh up to twice a day." = "Connection shows the source of the current prices (CSV mirror or API). Data updated is the latest price change reported by the GOV.UK server itself. Prices use the UK Fuel Finder dataset (Open Government Licence) and refresh up to twice a day.";
 "Prices near you" = "Prices near you";
 "FuelBoard uses your location to show prices around you and rank stations by distance. Your position never leaves the device." = "FuelBoard uses your location to show prices around you and rank stations by distance. Your position never leaves the device.";
-"Location was denied. You can still browse all stations, but \"nearest\" sorting needs it." = "Location was denied. You can still browse all stations, but \"nearest\" sorting needs it.";
+"Location was denied. You can still browse all stations, but \"closest\" sorting needs it." = "Location was denied. You can still browse all stations, but \"closest\" sorting needs it.";
 "Allowed" = "Allowed";
 "The system prompt will appear next." = "The system prompt will appear next.";
 "FuelBoard can notify you when you're approaching the cheapest station in your alert radius — even with the app closed. You can switch this off in the Alerts tab." = "FuelBoard can notify you when you're approaching the cheapest station in your alert radius — even with the app closed. You can switch this off in the Alerts tab.";
@@ -199,7 +219,9 @@
 "Cheapest station" = "Cheapest station";
 "Alert type" = "Alert type";
 "Best Value" = "Best Value";
+"Total" = "Total";
 "Minimum saving" = "Minimum saving";
+"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.";
@@ -212,3 +234,15 @@
 "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.";
+"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";
+"Price updated" = "Price updated";
+"%@ ago" = "%@ ago";
+"Not provided" = "Not provided";
+"May be outdated" = "May be outdated";
+"Fuel you'll receive" = "Fuel you'll receive";
+"Compared with your closest station." = "Compared with your closest station.";

FuelBoardTests/Sources/FuelBoardShared/FuelPriceFreshness.swift

@@ -0,0 +1 @@
+../../../Shared/FuelPriceFreshness.swift

FuelBoardTests/Tests/FuelBoardSharedTests/FuelBoardTests.swift

@@ -211,10 +211,10 @@ final class DistanceTests: XCTestCase {
     }
 
     func testMilesConversion() {
-        // 5 miles ≈ 8.05 km (app uses × 1.60934)
+        // 5 miles ≈ 8.05 km using the shared exact conversion
-        XCTAssertEqual(5 * 1.60934, 8.0467, accuracy: 0.001)
+        XCTAssertEqual(5 * FuelSavingsCalculator.kilometresPerMile, 8.04672, accuracy: 0.001)
-        // 262 km ≈ 162.8 miles (display uses × 0.621371)
+        // 262 km ≈ 162.8 miles using the shared exact conversion
-        XCTAssertEqual(262 * 0.621371, 162.8, accuracy: 0.1)
+        XCTAssertEqual(262 / FuelSavingsCalculator.kilometresPerMile, 162.8, accuracy: 0.1)
     }
 }
 
@@ -267,14 +267,14 @@ final class FuelTypeLabelTests: XCTestCase {
     }
 
     func testDistanceUnitConversion() {
-        XCTAssertEqual(DistanceUnit.miles.toKM(1), 1.60934, accuracy: 0.00001)
+        XCTAssertEqual(DistanceUnit.miles.toKM(1), 1.609344, accuracy: 0.00001)
         XCTAssertEqual(DistanceUnit.kilometers.toKM(5), 5)
-        XCTAssertEqual(DistanceUnit.miles.fromKM(1.60934), 1, accuracy: 0.00001)
+        XCTAssertEqual(DistanceUnit.miles.fromKM(1.609344), 1, accuracy: 0.00001)
         XCTAssertEqual(DistanceUnit.kilometers.fromKM(2.5), 2.5)
     }
 
     func testDistanceUnitFormat() {
-        XCTAssertEqual(DistanceUnit.miles.format(1.60934), "1.0 mi")
+        XCTAssertEqual(DistanceUnit.miles.format(1.609344), "1.0 mi")
         XCTAssertEqual(DistanceUnit.kilometers.format(3.4), "3.4 km")
     }
 }
@@ -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.
@@ -400,7 +462,7 @@ final class AlertRadiusFollowTests: XCTestCase {
         FuelStore.saveDistanceUnit(.miles)
         FuelStore.saveStationLimit(5)
         let eff = FuelStore.effectiveAlertsRadiusKM(followsSearch: true, manualKM: 3)
-        XCTAssertEqual(eff, 5 * 1.60934, accuracy: 0.001)
+        XCTAssertEqual(eff, 5 * FuelSavingsCalculator.kilometresPerMile, accuracy: 0.001)
     }
 }
 
@@ -731,7 +793,7 @@ final class RoadDistanceCacheTests: XCTestCase {
             sourceLat: sourceLat, sourceLng: sourceLng,
             entries: ["far": .init(meters: 23_500, lat: 51.5074, lng: -0.1278, returnMeters: 23_500)])
 
-        let tenMilesKM = 10 * 1.60934
+        let tenMilesKM = 10 * FuelSavingsCalculator.kilometresPerMile
         XCTAssertLessThan(far.distanceKM(to: sourceLat, lng2: sourceLng), tenMilesKM,
                           "fixture: the straight line must sit INSIDE the 10-mile radius")
         XCTAssertGreaterThan(FuelStore.displayDistanceKM(station: far, userLat: sourceLat, userLng: sourceLng),
@@ -743,7 +805,7 @@ final class RoadDistanceCacheTests: XCTestCase {
                                                       userLat: sourceLat, userLng: sourceLng),
                        "a station whose row reads 14.6 mi must not appear in a 10-mile list")
         // The same station is back once the radius actually covers its distance.
-        XCTAssertTrue(FuelStore.isWithinDisplayRadius(station: far, radiusKM: 15 * 1.60934,
+        XCTAssertTrue(FuelStore.isWithinDisplayRadius(station: far, radiusKM: 15 * FuelSavingsCalculator.kilometresPerMile,
                                                      userLat: sourceLat, userLng: sourceLng))
         // …and an unknown station (no cached route) still tests its displayed
         // straight line, so nothing changes for the bulk of the list.
@@ -783,10 +845,16 @@ final class RoadDistanceCacheTests: XCTestCase {
         XCTAssertFalse(confirmed.isApproximate, "a cached road distance is not an approximation")
         XCTAssertEqual(confirmed.km, 3.2, accuracy: 0.0001)
         XCTAssertEqual(confirmed.label(unit: .miles), "2.0 mi")
-        XCTAssertEqual(confirmed.labelWithReturn(unit: .miles), "2.0 mi (4.0 mi return)")
+        XCTAssertEqual(confirmed.labelWithReturn(unit: .miles), "2.0 mi (4.2 mi return)")
-        XCTAssertEqual(confirmed.labelWithReturn(unit: .kilometers), "3.2 km (6.4 km return)")
+        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.0 miles return")
+        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")
@@ -794,11 +862,44 @@ final class RoadDistanceCacheTests: XCTestCase {
         XCTAssertEqual(approximate.label(unit: .miles),
                        "Approx. " + DistanceUnit.miles.format(approximate.km))
         XCTAssertEqual(approximate.labelWithReturn(unit: .miles),
-                       "Approx. \(DistanceUnit.miles.format(approximate.km)) (\(DistanceUnit.miles.format(approximate.km * 2)) return)")
+                       "Approx. " + DistanceUnit.miles.format(approximate.km) + " (Approx. " + DistanceUnit.miles.format(approximate.km * 2) + " return)")
         XCTAssertEqual(approximate.spokenLabel(unit: .kilometers),
                        "Approximately " + DistanceUnit.kilometers.spoken(approximate.km))
         XCTAssertEqual(approximate.spokenLabelWithReturn(unit: .kilometers),
-                       "Approximately \(DistanceUnit.kilometers.spoken(approximate.km)), \(DistanceUnit.kilometers.spoken(approximate.km * 2)) return")
+                       "Approximately \(DistanceUnit.kilometers.spoken(approximate.km)), Approximately \(DistanceUnit.kilometers.spoken(approximate.km * 2)) return")
+    }
+
+    func testDisplayedReturnUsesTheIndependentlyMeasuredReturnRoute() {
+        FuelStore.setAccurateDistancesEnabled(true)
+        let station = station("separate-legs", 51.5074, -0.1278)
+        FuelStore.saveRoadDistances(
+            sourceLat: 51.6,
+            sourceLng: -0.1,
+            entries: ["separate-legs": .init(
+                meters: 4_650,
+                lat: station.lat,
+                lng: station.lng,
+                returnMeters: 4_820
+            )],
+            complete: true
+        )
+
+        let display = FuelStore.stationDistanceDisplay(
+            station: station,
+            userLat: 51.6,
+            userLng: -0.1
+        )
+
+        XCTAssertEqual(display.km, 4.65, accuracy: 1e-12)
+        XCTAssertEqual(display.returnKM, 9.47, accuracy: 1e-12)
+        XCTAssertFalse(display.isApproximate)
+        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
@@ -961,7 +1062,7 @@ final class RoadDistanceCacheTests: XCTestCase {
         let display = FuelStore.stationDistanceDisplay(station: routed, userLat: 51.6, userLng: -0.1)
         XCTAssertTrue(display.isApproximate, "the browse layer must never serve routes with the mode off")
         XCTAssertEqual(display.km, routed.distanceKM(to: 51.6, lng2: -0.1), accuracy: 0.0001)
-        XCTAssertTrue(FuelStore.isWithinDisplayRadius(station: routed, radiusKM: 10 * 1.60934,
+        XCTAssertTrue(FuelStore.isWithinDisplayRadius(station: routed, radiusKM: 10 * FuelSavingsCalculator.kilometresPerMile,
                                                       userLat: 51.6, userLng: -0.1),
                       "with the mode off the radius is a straight-line radius, agreeing with the rows")
 
@@ -1000,7 +1101,7 @@ final class RoadDistanceCacheTests: XCTestCase {
         let display = FuelStore.stationDistanceDisplay(station: routed, userLat: 51.6, userLng: -0.1)
         XCTAssertFalse(display.isApproximate)
         XCTAssertEqual(display.km, 23.5, accuracy: 0.0001)
-        XCTAssertFalse(FuelStore.isWithinDisplayRadius(station: routed, radiusKM: 10 * 1.60934,
+        XCTAssertFalse(FuelStore.isWithinDisplayRadius(station: routed, radiusKM: 10 * FuelSavingsCalculator.kilometresPerMile,
                                                        userLat: 51.6, userLng: -0.1),
                        "in this mode a 10-mile radius is 10 miles of driving, matching the routed rows")
     }

FuelBoardTests/Tests/FuelBoardSharedTests/FuelPriceFreshnessTests.swift

@@ -0,0 +1,179 @@
+import XCTest
+#if SWIFT_PACKAGE
+@testable import FuelBoardShared
+#endif
+
+/// Station-level price age — one timestamp per station, reported in More info
+/// and nowhere else.
+///
+/// The relay's `price_updated` is the newest `price_last_updated` across every
+/// grade a station maps, so it is not evidence about the selected grade. These
+/// tests pin what the app *reports*; `StationPriceAgePolicyTests` pins what the
+/// app does about it (nothing).
+final class FuelPriceFreshnessTests: XCTestCase {
+    private let now = Date(timeIntervalSince1970: 1_800_000_000)
+
+    private func at(_ offset: TimeInterval) -> TimeInterval {
+        now.addingTimeInterval(offset).timeIntervalSince1970
+    }
+
+    private func station(priceUpdated: TimeInterval?) -> FuelStation {
+        FuelStation(id: "freshness-station", name: "Freshness Station", brand: "Test",
+                    address: "1 High Street", postcode: "BD1 1AA", lat: 53.79, lng: -1.75,
+                    prices: [.e10: 169.9], priceUpdated: priceUpdated)
+    }
+
+    // MARK: - One figure per station, whatever fuel is on screen
+
+    func testOneAgeIsReportedForEveryFuelAStationSells() {
+        let sold = FuelStation(id: "multi", name: "Multi", brand: "", address: "", postcode: "",
+                               lat: 53, lng: -1, prices: [.e5: 165.9, .e10: 169.9, .diesel: 129.9],
+                               priceUpdated: at(-28 * 60 * 60))
+
+        for fuel in FuelType.allCases {
+            XCTAssertEqual(FuelPriceFreshness.assessment(for: sold, now: now).updateAgeLabel,
+                           "28h ago",
+                           "\(fuel.rawValue): every grade reads the same station timestamp")
+        }
+    }
+
+    func testStationTimestampIsDecodedAndNoPerGradeTimestampIsInvented() throws {
+        let json = """
+        {
+          "stations": [{
+            "id": "s1",
+            "name": "LISTER ARMS",
+            "brand": "Shell",
+            "address": "MANCHESTER ROAD, BRADFORD",
+            "postcode": "BD5 7JX",
+            "lat": 53.78,
+            "lng": -1.75,
+            "prices": {"E10": 169.9, "DIESEL": 129.9},
+            "price_updated": "2026-10-14T07:45:52Z",
+            "price_updated_by_grade": {
+              "E10": "2026-01-01T00:00:00Z",
+              "DIESEL": "2026-01-01T00:00:00Z"
+            }
+          }]
+        }
+        """
+        let decoded = try XCTUnwrap(try FuelPriceProvider.decodeStations(from: Data(json.utf8)).first)
+
+        XCTAssertEqual(decoded.priceUpdated,
+                       ISO8601DateFormatter.fuelBoardDate("2026-10-14T07:45:52Z")?.timeIntervalSince1970,
+                       "the station-level field is what the app records")
+        // A per-grade map in the payload is ignored: the app has one age, and it
+        // is the station's.
+        let assessment = FuelPriceFreshness.assessment(for: decoded, now: now)
+        XCTAssertEqual(assessment.status, .outdated,
+                       "the station field is used, not the 2026-01-01 grade entries")
+    }
+
+    // MARK: - Reading the age
+
+    func testFreshAgeReadsInMinutesThenHours() {
+        XCTAssertEqual(FuelPriceFreshness.assessment(priceUpdated: at(-59 * 60), now: now).updateAgeLabel,
+                       "59m ago")
+        XCTAssertEqual(FuelPriceFreshness.assessment(priceUpdated: at(-60 * 60), now: now).updateAgeLabel,
+                       "1h ago")
+        XCTAssertEqual(FuelPriceFreshness.assessment(priceUpdated: at(-47 * 60 * 60), now: now).updateAgeLabel,
+                       "47h ago")
+        XCTAssertEqual(FuelPriceFreshness.assessment(priceUpdated: at(-48 * 60 * 60), now: now).updateAgeLabel,
+                       "2d ago")
+    }
+
+    func testFreshInformationIsNeverFlagged() {
+        let assessment = FuelPriceFreshness.assessment(for: station(priceUpdated: at(-28 * 60 * 60)), now: now)
+        XCTAssertEqual(assessment.status, .fresh)
+        XCTAssertFalse(assessment.isOutdated)
+        XCTAssertNil(assessment.outdatedNotice)
+        XCTAssertEqual(assessment.age, 28 * 60 * 60)
+    }
+
+    // MARK: - The thirty-day display threshold
+
+    func testInformationExactlyThirtyDaysOldIsNotYetFlagged() {
+        let assessment = FuelPriceFreshness.assessment(priceUpdated: at(-FuelPriceFreshness.outdatedAge), now: now)
+        XCTAssertEqual(assessment.status, .fresh)
+        XCTAssertNil(assessment.outdatedNotice)
+    }
+
+    func testInformationJustPastThirtyDaysIsFlaggedButStillReportsItsAge() {
+        let assessment = FuelPriceFreshness.assessment(priceUpdated: at(-FuelPriceFreshness.outdatedAge - 1), now: now)
+        XCTAssertEqual(assessment.status, .outdated)
+        XCTAssertTrue(assessment.isOutdated)
+        XCTAssertEqual(assessment.outdatedNotice, "May be outdated")
+        XCTAssertEqual(assessment.updateAgeLabel, "30d ago")
+    }
+
+    func testLongOldInformationIsFlaggedWithItsDayCount() {
+        // The oldest figure the mirror carries for a real station is ~250 days.
+        let assessment = FuelPriceFreshness.assessment(priceUpdated: at(-250 * 86_400), now: now)
+        XCTAssertEqual(assessment.status, .outdated)
+        XCTAssertEqual(assessment.updateAgeLabel, "250d ago")
+        XCTAssertEqual(assessment.outdatedNotice, "May be outdated")
+    }
+
+    // MARK: - Missing, malformed, future and absurd timestamps
+
+    func testMissingTimestampReadsNotProvidedAndIsNeverFlagged() {
+        let assessment = FuelPriceFreshness.assessment(for: station(priceUpdated: nil), now: now)
+        XCTAssertEqual(assessment.status, .unknown)
+        XCTAssertNil(assessment.age)
+        XCTAssertEqual(assessment.updateAgeLabel, "Not provided")
+        XCTAssertFalse(assessment.isOutdated)
+        XCTAssertNil(assessment.outdatedNotice)
+    }
+
+    func testUnparseableSourceTextIsDroppedRatherThanGuessed() throws {
+        XCTAssertNil(FuelPriceTimestamp.parse("not-a-date"))
+        XCTAssertNil(FuelPriceTimestamp.parse(""))
+        XCTAssertNil(FuelPriceTimestamp.parse("   "))
+
+        let json = """
+        {"stations": [{"id": "bad", "name": "Bad", "brand": "", "address": "", "postcode": "",
+          "lat": 53, "lng": -1, "prices": {"E10": 169.9}, "price_updated": "2026-99-99T99:99:99Z"}]}
+        """
+        let decoded = try XCTUnwrap(try FuelPriceProvider.decodeStations(from: Data(json.utf8)).first)
+        XCTAssertNil(decoded.priceUpdated)
+        XCTAssertEqual(FuelPriceFreshness.assessment(for: decoded, now: now).updateAgeLabel, "Not provided")
+    }
+
+    func testSmallClockSkewReadsAsJustNowNotAsAFutureDate() {
+        let assessment = FuelPriceFreshness.assessment(priceUpdated: at(60), now: now)
+        XCTAssertEqual(assessment.status, .fresh)
+        XCTAssertEqual(assessment.age, 0)
+        XCTAssertEqual(assessment.updateAgeLabel, "0m ago")
+    }
+
+    func testTimestampBeyondTheSkewToleranceIsUnusableNotOptimistic() {
+        let assessment = FuelPriceFreshness.assessment(priceUpdated: at(86_400), now: now)
+        XCTAssertEqual(assessment.status, .invalid)
+        XCTAssertNil(assessment.age)
+        XCTAssertEqual(assessment.updateAgeLabel, "Not provided")
+        XCTAssertNil(assessment.outdatedNotice)
+    }
+
+    func testNonFiniteAndAbsurdEpochsAreUnusableAndCannotTrap() {
+        let values: [TimeInterval] = [.nan, .infinity, -.infinity,
+                                      .greatestFiniteMagnitude, -.greatestFiniteMagnitude]
+        for value in values {
+            let assessment = FuelPriceFreshness.assessment(priceUpdated: value, now: now)
+            XCTAssertEqual(assessment.status, .invalid, "\(value)")
+            XCTAssertNil(assessment.age, "\(value)")
+            XCTAssertEqual(assessment.updateAgeLabel, "Not provided", "\(value)")
+            XCTAssertFalse(assessment.isOutdated, "\(value)")
+        }
+    }
+}
+
+private extension ISO8601DateFormatter {
+    static func fuelBoardDate(_ string: String) -> Date? {
+        let formatter = ISO8601DateFormatter()
+        formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+        return formatter.date(from: string) ?? {
+            formatter.formatOptions = [.withInternetDateTime]
+            return formatter.date(from: string)
+        }()
+    }
+}

FuelBoardTests/Tests/FuelBoardSharedTests/FuelSavingsCalculationAuditTests.swift

@@ -48,6 +48,42 @@ final class FuelSavingsCalculationAuditTests: XCTestCase {
 
     // MARK: - 1. Unit conversion
 
+    func testBudgetExamplesAcrossAllFuelTypes() throws {
+        for fuel in FuelType.allCases {
+            let base = FuelStation(id: "base", name: "Base", brand: "", address: "", postcode: "", lat: 53, lng: -1, prices: [fuel: 199.9], priceUpdated: nil)
+            let other = FuelStation(id: "other", name: "Other", brand: "", address: "", postcode: "", lat: 53, lng: -1, prices: [fuel: 129.9], priceUpdated: nil)
+            let settings = FuelSavingsSettings(enabled: true, mpg: 30, preferredAmount: .init(value: 40, unit: .pounds))
+            for budget in [20.0, 40, 60, 73, 100] {
+                let result = FuelSavingsEstimator.availability(station: other, fuel: fuel, baseline: base,
+                    settings: settings, amount: .init(value: budget, unit: .pounds),
+                    journey: .init(miles: 8.3, basis: .roadRoute),
+                    baselineJourney: .init(miles: 0.9, basis: .roadRoute))?.result
+                let volume = budget / 1.299
+                XCTAssertEqual(result?.fillLitres ?? 0, volume, accuracy: 1e-9)
+                XCTAssertEqual(result?.grossSavingGBP ?? 0, volume * 0.7, accuracy: 1e-9)
+                XCTAssertEqual(result?.netSavingGBP ?? 0, volume * 0.7 - 7.4 / 30 * 4.54609 * 1.299, accuracy: 1e-9)
+            }
+        }
+    }
+
+    func testCandidateBudgetAndEqualQuantitySavingsForEveryFuel() throws {
+        for fuel in FuelType.allCases {
+            let candidate = FuelStation(id: "candidate-\(fuel.rawValue)", name: "Candidate", brand: "", address: "", postcode: "", lat: 53.7, lng: -1.8, prices: [fuel: 129.9], priceUpdated: nil)
+            let baseline = FuelStation(id: "baseline-\(fuel.rawValue)", name: "Nearest", brand: "", address: "", postcode: "", lat: 53.7, lng: -1.8, prices: [fuel: 199.9], priceUpdated: nil)
+            let configured = FuelSavingsSettings(enabled: true, mpg: 30, preferredAmount: .init(value: 60, unit: .pounds))
+            let money = FuelSavingsEstimator.availability(station: candidate, fuel: fuel, baseline: baseline, settings: configured,
+                amount: .init(value: 60, unit: .pounds), journey: .init(miles: 8.3, basis: .roadRoute),
+                baselineJourney: .init(miles: 0.9, basis: .roadRoute))?.result
+            let litres = FuelSavingsEstimator.availability(station: candidate, fuel: fuel, baseline: baseline, settings: configured,
+                amount: .init(value: 60 / 1.299, unit: .litres), journey: .init(miles: 8.3, basis: .roadRoute),
+                baselineJourney: .init(miles: 0.9, basis: .roadRoute))?.result
+            XCTAssertEqual(money?.fillLitres ?? 0, 60 / 1.299, accuracy: 1e-8, fuel.rawValue)
+            XCTAssertEqual(money?.grossSavingGBP ?? 0, litres?.grossSavingGBP ?? -1, accuracy: 1e-8, fuel.rawValue)
+            XCTAssertEqual(money?.netSavingGBP ?? 0, litres?.netSavingGBP ?? -1, accuracy: 1e-8, fuel.rawValue)
+            XCTAssertEqual(money?.netSavingGBP ?? 0, (money?.grossSavingGBP ?? 0) - (money?.extraDrivingCostGBP ?? 0), accuracy: 1e-8, fuel.rawValue)
+        }
+    }
+
     func testImperialGallonIsUsedNotTheUSGallon() {
         XCTAssertEqual(FuelSavingsCalculator.imperialGallonLitres, 4.54609)
         XCTAssertNotEqual(FuelSavingsCalculator.imperialGallonLitres, 3.785411784,
@@ -82,18 +118,84 @@ final class FuelSavingsCalculationAuditTests: XCTestCase {
         XCTAssertEqual(FuelSavingsFormat.distance(1, unit: .miles), DistanceUnit.miles.format(1.609344))
     }
 
-    // MARK: - 2/4. The three stations from the brief
+    // MARK: - 2. Candidate-priced fill-up
+
+    func testPoundsFillUsesCandidatePriceForLitresAndGrossSaving() throws {
+        let result = try FuelSavingsCalculator.calculate(
+            mpg: 30,
+            amount: FuelSavingsFillAmount(value: 60, unit: .pounds),
+            baselinePricePencePerLitre: 171.9,
+            candidatePricePencePerLitre: 169.9,
+            baselineJourneyMiles: 0.879,
+            candidateJourneyMiles: 8.306
+        )
+
+        XCTAssertEqual(result.fillLitres, 60 / 1.699, accuracy: 1e-9)
+        XCTAssertEqual(result.grossSavingGBP, (60 / 1.699) * 0.02, accuracy: 1e-9)
+        XCTAssertEqual(FuelSavingsFormat.money(result.grossSavingGBP), "£0.71")
+        XCTAssertEqual(result.extraFuelLitres, 1.1254603476666667, accuracy: 1e-9)
+        XCTAssertEqual(result.extraDrivingCostGBP, 1.9121571306856667, accuracy: 1e-9)
+        XCTAssertEqual(result.netSavingGBP, -1.2058593084372853, accuracy: 1e-9)
+        XCTAssertEqual(result.headline(), "Costs £1.21 more")
+    }
+
+    func testPoundsExamplesScaleFromThirtyToOneHundredPounds() throws {
+        for (budget, expectedLitres, expectedGross) in [
+            (30.0, 17.657445556209535, 0.3531489111241907),
+            (60.0, 35.31489111241907, 0.7062978222483814),
+            (100.0, 58.85815185403179, 1.1771630370806357)
+        ] {
+            let result = try FuelSavingsCalculator.calculate(
+                mpg: 30,
+                amount: FuelSavingsFillAmount(value: budget, unit: .pounds),
+                baselinePricePencePerLitre: 171.9,
+                candidatePricePencePerLitre: 169.9,
+                baselineJourneyMiles: 0,
+                candidateJourneyMiles: 0
+            )
+            XCTAssertEqual(result.fillLitres, expectedLitres, accuracy: 1e-8)
+            XCTAssertEqual(result.grossSavingGBP, expectedGross, accuracy: 1e-8)
+        }
+    }
+
+    func testCandidatePriceControlsLitresWhileBaselinePriceOnlyChangesSaving() throws {
+        let amount = FuelSavingsFillAmount(value: 60, unit: .pounds)
+        let first = try FuelSavingsCalculator.calculate(
+            mpg: 30, amount: amount,
+            baselinePricePencePerLitre: 171.9,
+            candidatePricePencePerLitre: 169.9,
+            baselineJourneyMiles: 0, candidateJourneyMiles: 0
+        )
+        let differentBaseline = try FuelSavingsCalculator.calculate(
+            mpg: 30, amount: amount,
+            baselinePricePencePerLitre: 179.9,
+            candidatePricePencePerLitre: 169.9,
+            baselineJourneyMiles: 0, candidateJourneyMiles: 0
+        )
+        let differentCandidate = try FuelSavingsCalculator.calculate(
+            mpg: 30, amount: amount,
+            baselinePricePencePerLitre: 179.9,
+            candidatePricePencePerLitre: 159.9,
+            baselineJourneyMiles: 0, candidateJourneyMiles: 0
+        )
+
+        XCTAssertEqual(first.fillLitres, differentBaseline.fillLitres, accuracy: 1e-12)
+        XCTAssertNotEqual(first.grossSavingGBP, differentBaseline.grossSavingGBP)
+        XCTAssertNotEqual(differentBaseline.fillLitres, differentCandidate.fillLitres)
+    }
+
+    // MARK: - 3/5. The three stations from the brief
 
     func testBriefCaseTescoBradfordIsMarginallyWorseOff() throws {
         let result = try briefResult(candidatePrice: 170.9, extraMiles: 2.0)
 
-        XCTAssertEqual(result.fillLitres, 34.904014, accuracy: 1e-6)
+        XCTAssertEqual(result.fillLitres, 35.108250, accuracy: 1e-6)
-        XCTAssertEqual(result.grossSavingGBP, 0.349040, accuracy: 1e-6, "1p/litre cheaper on a 34.90 L fill")
+        XCTAssertEqual(result.grossSavingGBP, 0.351083, accuracy: 1e-6, "£60 buys 35.11 L at the candidate price")
         XCTAssertEqual(result.extraDistanceMiles, 2.0, accuracy: 1e-9)
         XCTAssertEqual(result.extraDrivingCostGBP, 0.517951, accuracy: 1e-6)
-        XCTAssertEqual(result.netSavingGBP, -0.168911, accuracy: 1e-6)
+        XCTAssertEqual(result.netSavingGBP, -0.166869, accuracy: 1e-6)
         XCTAssertEqual(result.status, .notWorthTheDrive)
-        XCTAssertEqual(result.headline(), "£0.17 worse off after travel")
+        XCTAssertEqual(result.headline(), "Costs £0.17 more")
     }
 
     /// The brief recorded "£0.18 worse off" for this row against a displayed
@@ -104,9 +206,9 @@ final class FuelSavingsCalculationAuditTests: XCTestCase {
     /// is entirely the rounding of the distance, not of the money.
     func testTheReportedEighteenPenceIsRoundedExtraDistanceNotARoundingBug() throws {
         XCTAssertEqual(try briefResult(candidatePrice: 170.9, extraMiles: 2.00).headline(),
-                       "£0.17 worse off after travel")
+                       "Costs £0.17 more")
         XCTAssertEqual(try briefResult(candidatePrice: 170.9, extraMiles: 2.05).headline(),
-                       "£0.18 worse off after travel")
+                       "Costs £0.18 more")
 
         // 2.05 mi shows as "2.0 mi" at one decimal place — the same caption.
         XCTAssertEqual(FuelSavingsFormat.extraTravelLabel(extraDistanceMiles: 2.05, unit: .miles),
@@ -118,13 +220,13 @@ final class FuelSavingsCalculationAuditTests: XCTestCase {
     func testBriefCaseMFGHareAndHoundsIsWorseOff() throws {
         let result = try briefResult(candidatePrice: 172.9, extraMiles: 2.8)
 
-        XCTAssertEqual(result.fillLitres, 34.904014, accuracy: 1e-6)
+        XCTAssertEqual(result.fillLitres, 34.702140, accuracy: 1e-6)
-        XCTAssertEqual(result.grossSavingGBP, -0.349040, accuracy: 1e-6, "1p/litre dearer costs 34.90 L × 1p")
+        XCTAssertEqual(result.grossSavingGBP, -0.347021, accuracy: 1e-6, "£60 buys 34.70 L at the candidate price")
         XCTAssertEqual(result.extraDistanceMiles, 2.8, accuracy: 1e-9)
         XCTAssertEqual(result.extraDrivingCostGBP, 0.733618, accuracy: 1e-6)
-        XCTAssertEqual(result.netSavingGBP, -1.082658, accuracy: 1e-6)
+        XCTAssertEqual(result.netSavingGBP, -1.080639, accuracy: 1e-6)
         XCTAssertEqual(result.status, .notWorthTheDrive)
-        XCTAssertEqual(result.headline(), "£1.08 worse off after travel")
+        XCTAssertEqual(result.headline(), "Costs £1.08 more")
     }
 
     func testBriefCasePGGNapoleonSamePumpPriceIsTravelCostOnly() throws {
@@ -135,7 +237,7 @@ final class FuelSavingsCalculationAuditTests: XCTestCase {
         XCTAssertEqual(result.netSavingGBP, -0.729375, accuracy: 1e-6,
                        "with no price difference the whole result is the extra driving")
         XCTAssertEqual(result.status, .notWorthTheDrive)
-        XCTAssertEqual(result.headline(), "£0.73 worse off after travel")
+        XCTAssertEqual(result.headline(), "Costs £0.73 more")
     }
 
     // MARK: - 5/6. Classification, tolerance and rounding
@@ -150,15 +252,15 @@ final class FuelSavingsCalculationAuditTests: XCTestCase {
     }
 
     func testSmallSavingInsideTheToleranceIsBreakEvenNotPennies() throws {
-        // 171.9p vs 170.9p over a 1.23 mi delta: net +£0.0305.
+        // 171.9p vs 170.9p over a 1.23 mi delta: the small saving remains within tolerance.
         let result = try briefResult(candidatePrice: 170.9, extraMiles: 1.23)
-        XCTAssertEqual(result.netSavingGBP, 0.030500, accuracy: 1e-6)
+        XCTAssertEqual(result.netSavingGBP, 0.03254252417853143, accuracy: 1e-9)
         XCTAssertEqual(result.status, .breakEven, "±5p reads as break even rather than a meaningless £0.03")
         XCTAssertEqual(result.headline(), "Break even")
     }
 
     func testBreakEvenToleranceDecidesTheClassificationAtTheBoundary() throws {
-        let net = -0.168911
+        let net = -0.166869
         // A tolerance wider than the loss → break even; narrower → worse off.
         let lenient = try FuelSavingsCalculator.calculate(
             mpg: 30,
@@ -187,7 +289,7 @@ final class FuelSavingsCalculationAuditTests: XCTestCase {
     func testMoneyIsRoundedOnlyForDisplay() throws {
         // Full precision retained internally…
         let result = try briefResult(candidatePrice: 172.9, extraMiles: 2.8)
-        XCTAssertEqual(result.netSavingGBP, -1.082658, accuracy: 1e-6)
+        XCTAssertEqual(result.netSavingGBP, -1.080639, accuracy: 1e-6)
         XCTAssertNotEqual(result.netSavingGBP, -1.08, "the stored value must not be pre-rounded")
         // …and rounded to two places only when shown.
         XCTAssertEqual(FuelSavingsFormat.money(1.082658), "£1.08")
@@ -197,6 +299,23 @@ final class FuelSavingsCalculationAuditTests: XCTestCase {
         XCTAssertEqual(FuelSavingsFormat.money(0), "£0.00")
     }
 
+    func testIndependentlyRoundedFinancialComponentsMayDifferFromRoundedTotalByOnePenny() {
+        let gross = 1.234
+        let drivingCost = 0.005
+        let net = gross - drivingCost
+
+        XCTAssertEqual(FuelSavingsFormat.money(gross), "£1.23")
+        XCTAssertEqual(FuelSavingsFormat.money(drivingCost), "£0.01")
+        XCTAssertEqual(FuelSavingsFormat.money(net), "£1.23")
+        let independentlyRoundedSubtraction = 1.23 - 0.01
+        XCTAssertEqual(independentlyRoundedSubtraction, 1.22, accuracy: 1e-12)
+        XCTAssertNotEqual(
+            FuelSavingsFormat.money(independentlyRoundedSubtraction),
+            FuelSavingsFormat.money(net),
+            "the raw total remains authoritative; independently rounded components need not add back exactly"
+        )
+    }
+
     func testSortingUsesTheUnroundedNetSoRoundedTiesStillOrderCorrectly() {
         // Two rows that both DISPLAY "£0.18 worse off" but differ in the raw
         // figure: the sort must use the raw value, never the shown one.
@@ -237,12 +356,12 @@ final class FuelSavingsCalculationAuditTests: XCTestCase {
             baselineJourneyMiles: 2.0,
             candidateJourneyMiles: 7.0
         )
-        XCTAssertEqual(result.fillLitres, 27.416038, accuracy: 1e-6)
+        XCTAssertEqual(result.fillLitres, 28.797696, accuracy: 1e-6)
-        XCTAssertEqual(result.grossSavingGBP, 1.919123, accuracy: 1e-6)
+        XCTAssertEqual(result.grossSavingGBP, 2.015839, accuracy: 1e-6)
         XCTAssertEqual(result.extraDrivingCostGBP, 0.701613, accuracy: 1e-6)
-        XCTAssertEqual(result.netSavingGBP, 1.217509, accuracy: 1e-6)
+        XCTAssertEqual(result.netSavingGBP, 1.314226, accuracy: 1e-6)
         XCTAssertEqual(result.status, .worthTheDrive)
-        XCTAssertEqual(result.headline(), "£1.22 better off after travel")
+        XCTAssertEqual(result.headline(), "Save £1.31")
     }
 
     func testNearerCandidateIsNeverChargedExtraTravel() throws {
@@ -270,9 +389,9 @@ final class FuelSavingsCalculationAuditTests: XCTestCase {
             baselineJourneyMiles: 0.8,
             candidateJourneyMiles: 3.6
         )
-        XCTAssertEqual(sixty.grossSavingGBP, -0.349040, accuracy: 1e-6, "MPG must not touch the pump saving")
+        XCTAssertEqual(sixty.grossSavingGBP, -0.347021, accuracy: 1e-6, "MPG must not touch the pump saving")
         XCTAssertEqual(sixty.extraDrivingCostGBP, 0.366809, accuracy: 1e-6)
-        XCTAssertEqual(sixty.netSavingGBP, -0.715849, accuracy: 1e-6)
+        XCTAssertEqual(sixty.netSavingGBP, -0.713830, accuracy: 1e-6)
 
         let fortyFive = try FuelSavingsCalculator.calculate(
             mpg: 45,
@@ -283,7 +402,7 @@ final class FuelSavingsCalculationAuditTests: XCTestCase {
             candidateJourneyMiles: 3.6
         )
         XCTAssertEqual(fortyFive.extraDrivingCostGBP, 0.489078, accuracy: 1e-6)
-        XCTAssertEqual(fortyFive.netSavingGBP, -0.838119, accuracy: 1e-6)
+        XCTAssertEqual(fortyFive.netSavingGBP, -0.836100, accuracy: 1e-6)
     }
 
     func testDifferentFillBudgetsScaleOnlyThePumpSaving() throws {
@@ -295,10 +414,10 @@ final class FuelSavingsCalculationAuditTests: XCTestCase {
             baselineJourneyMiles: 0.8,
             candidateJourneyMiles: 3.6
         )
-        XCTAssertEqual(forty.fillLitres, 23.269343, accuracy: 1e-6, "£40 buys 23.27 L at 171.9p")
+        XCTAssertEqual(forty.fillLitres, 23.134760, accuracy: 1e-6, "£40 buys 23.13 L at the candidate price")
-        XCTAssertEqual(forty.grossSavingGBP, -0.232693, accuracy: 1e-6)
+        XCTAssertEqual(forty.grossSavingGBP, -0.231348, accuracy: 1e-6)
         XCTAssertEqual(forty.extraDrivingCostGBP, 0.733618, accuracy: 1e-6, "the journey cost is budget-independent")
-        XCTAssertEqual(forty.netSavingGBP, -0.966311, accuracy: 1e-6)
+        XCTAssertEqual(forty.netSavingGBP, -0.964965, accuracy: 1e-6)
 
         let ninety = try FuelSavingsCalculator.calculate(
             mpg: 30,
@@ -308,9 +427,9 @@ final class FuelSavingsCalculationAuditTests: XCTestCase {
             baselineJourneyMiles: 0.8,
             candidateJourneyMiles: 3.6
         )
-        XCTAssertEqual(ninety.fillLitres, 52.356021, accuracy: 1e-6)
+        XCTAssertEqual(ninety.fillLitres, 52.053210, accuracy: 1e-6)
-        XCTAssertEqual(ninety.grossSavingGBP, -0.523560, accuracy: 1e-6)
+        XCTAssertEqual(ninety.grossSavingGBP, -0.520532, accuracy: 1e-6)
-        XCTAssertEqual(ninety.netSavingGBP, -1.257178, accuracy: 1e-6)
+        XCTAssertEqual(ninety.netSavingGBP, -1.254150, accuracy: 1e-6)
     }
 
     func testFillUpInLitresIsFixedRegardlessOfPrice() throws {
@@ -370,7 +489,7 @@ final class FuelSavingsCalculationAuditTests: XCTestCase {
             journey: journey(2.8),
             baselineJourney: journey(0.8)
         )
-        XCTAssertEqual(both?.result?.netSavingGBP ?? 0, -0.168911, accuracy: 1e-6)
+        XCTAssertEqual(both?.result?.netSavingGBP ?? 0, -0.166869, accuracy: 1e-6)
     }
 
     func testMixedRouteBasisIsReportedAsAnEstimate() {
@@ -393,7 +512,7 @@ final class FuelSavingsCalculationAuditTests: XCTestCase {
         XCTAssertEqual(mixed?.result?.distanceBasis, .straightLine,
                        "one unmeasured leg makes the whole estimate an estimate")
         XCTAssertEqual(mixed?.result?.journeyConfidence, .estimated)
-        XCTAssertEqual(mixed?.result?.headline(compact: true), "Approx. £0.17 worse off after travel")
+        XCTAssertEqual(mixed?.result?.headline(compact: true), "Approx. Costs £0.17 more")
     }
 
     func testBaselineStationIsLabelledClosestStationNotBreakEven() {

FuelBoardTests/Tests/FuelBoardSharedTests/FuelSavingsEstimateTests.swift

@@ -41,6 +41,42 @@ final class FuelSavingsEstimateTests: XCTestCase {
         FuelSavingsJourney(miles: miles, basis: .straightLine)
     }
 
+    /// Fuel types are never mixed: a station that does not sell the selected
+    /// fuel cannot be its baseline, and cannot be compared with it.
+    func testDifferentFuelNeverUsesAnotherGradeAsItsBaseline() {
+        let petrolOnly = FuelStation(id: "petrol", name: "Petrol", brand: "", address: "", postcode: "", lat: 53, lng: -1,
+            prices: [.e10: 199.9], priceUpdated: nil)
+        let dieselOnly = FuelStation(id: "diesel", name: "Diesel", brand: "", address: "", postcode: "", lat: 53, lng: -1,
+            prices: [.diesel: 129.9], priceUpdated: nil)
+        let nearest = FuelSavingsEstimator.baselineStation([petrolOnly, dieselOnly], fuel: .diesel) { station in
+            self.straightLine(station.id == "petrol" ? 0.5 : 1)
+        }
+        XCTAssertEqual(nearest?.id, "diesel")
+        let unavailable = FuelSavingsEstimator.availability(station: dieselOnly, fuel: .diesel, baseline: petrolOnly,
+            settings: settings, amount: amount, journey: straightLine(1), baselineJourney: straightLine(0.5))
+        XCTAssertEqual(unavailable, .unavailable("No comparison station"))
+    }
+
+    /// Ranking must still work when the list being ordered is filtered tighter
+    /// than the pool the baseline was chosen from.
+    func testBaselineOutsideFilteredPoolStillRanksByNetSaving() {
+        let baseline = station("nearest-outside-radius", price: 199.9)
+        let cheap = station("z-cheap", price: 129.9)
+        let expensive = station("a-expensive", price: 198.9)
+        let ranked = FuelSavingsEstimator.ranked(
+            [expensive, cheap], fuel: .e10, baseline: baseline,
+            settings: settings, amount: amount,
+            journeyMiles: { s in self.straightLine(s.id == baseline.id ? 0.8 : 4.0) }
+        )
+        XCTAssertEqual(ranked.map(\.id), ["z-cheap", "a-expensive"])
+        let expected = FuelSavingsEstimator.availability(
+            station: cheap, fuel: .e10, baseline: baseline,
+            settings: settings, amount: amount,
+            journey: straightLine(4.0), baselineJourney: straightLine(0.8)
+        )?.result
+        XCTAssertGreaterThan(expected?.netSavingGBP ?? -1, 0)
+    }
+
     func testCheaperStationThreePointFiveMilesAwayIsRankedFirstWithASaving() {
         // Nearest station: 1 mile away at 145.9p. The station the user can see
         // in the Cheapest tab: 3.5 miles away at 138.9p.
@@ -284,9 +320,9 @@ final class FuelSavingsEstimateTests: XCTestCase {
     /// (171.9p, 0.4 mi), candidate Shell Whetley Hill (167.9p, 3.8 mi).
     ///
     /// Whetley Hill is 4p/litre cheaper, yet it is WORSE OFF — and that is
-    /// correct, not a calculation bug: £60 buys 34.90 L at 171.9p, so the
+    /// correct, not a calculation bug: £60 buys 35.74 L at 167.9p, so the
-    /// cheaper pump saves 34.90 × 4p = £1.40, while the extra 6.8 return miles
+    /// cheaper pump saves 35.74 × 4p = £1.43, while the extra 6.8 return miles
-    /// burn 6.8/30 × 4.54609 = 1.03 L at 167.9p = £1.73. Net ≈ −£0.33.
+    /// burn 6.8/30 × 4.54609 = 1.03 L at 167.9p = £1.73. Net ≈ −£0.30.
     func testCheaperStationFurtherAwayIsWorseOffAfterTravel() {
         let baseline = station("rontec-shelf", price: 171.9)
         let candidate = station("shell-whetley-hill", price: 167.9)
@@ -304,16 +340,16 @@ final class FuelSavingsEstimateTests: XCTestCase {
         guard let result = availability?.result else {
             return XCTFail("expected an estimate, got \(String(describing: availability))")
         }
-        XCTAssertEqual(result.fillLitres, 34.904, accuracy: 0.005,
+        XCTAssertEqual(result.fillLitres, 35.736, accuracy: 0.005,
-                       "the £60 budget buys litres at the BASELINE pump price")
+                       "the £60 budget buys litres at the candidate pump price")
-        XCTAssertEqual(result.grossSavingGBP, 1.396, accuracy: 0.005)
+        XCTAssertEqual(result.grossSavingGBP, 1.429, accuracy: 0.005)
         XCTAssertEqual(result.extraDistanceMiles, 6.8, accuracy: 0.001,
                        "only the return-trip DELTA counts — the shared journey is never counted twice")
         XCTAssertEqual(result.extraDrivingCostGBP, 1.730, accuracy: 0.005)
-        XCTAssertEqual(result.netSavingGBP, -0.334, accuracy: 0.005)
+        XCTAssertEqual(result.netSavingGBP, -0.301, accuracy: 0.005)
         XCTAssertEqual(result.status, .notWorthTheDrive)
         XCTAssertEqual(result.journeyConfidence, .estimated)
-        XCTAssertEqual(result.headline(compact: true), "Approx. £0.33 worse off after travel")
+        XCTAssertEqual(result.headline(compact: true), "Approx. Costs £0.30 more")
     }
 
     func testMeasuredRoadRoutesDropTheEstimateMarker() {
@@ -332,8 +368,8 @@ final class FuelSavingsEstimateTests: XCTestCase {
 
         XCTAssertEqual(availability?.result?.distanceBasis, .roadRoute)
         XCTAssertEqual(availability?.result?.journeyConfidence, .confirmed)
-        XCTAssertEqual(availability?.result?.headline(compact: true), "£0.33 worse off after travel")
+        XCTAssertEqual(availability?.result?.headline(compact: true), "Costs £0.30 more")
-        XCTAssertEqual(availability?.result?.headline(), "£0.33 worse off after travel")
+        XCTAssertEqual(availability?.result?.headline(), "Costs £0.30 more")
     }
 
     func testBaselineRowIsLabelledClosestStation() {
@@ -375,10 +411,10 @@ final class FuelSavingsEstimateTests: XCTestCase {
             return XCTFail("expected an estimate, got \(String(describing: availability))")
         }
         XCTAssertEqual(result.status, .worthTheDrive)
-        // £60 buys 37.5 L at 160p; 10p/litre cheaper saves £3.75; 0.4 extra
+        // £60 buys 40 L at 150p; 10p/litre cheaper saves £4.00; 0.4 extra
-        // return miles cost ~£0.09. Net ≈ £3.66.
+        // return miles cost ~£0.09. Net ≈ £3.91.
-        XCTAssertEqual(result.netSavingGBP, 3.659, accuracy: 0.005)
+        XCTAssertEqual(result.netSavingGBP, 3.909, accuracy: 0.005)
-        XCTAssertEqual(result.headline(compact: true), "Approx. £3.66 better off after travel")
+        XCTAssertEqual(result.headline(compact: true), "Approx. Save £3.91")
     }
 
     func testNeutralResultHeadlineIsBreakEven() {
@@ -413,7 +449,7 @@ final class FuelSavingsEstimateTests: XCTestCase {
                                        netSavingGBP: 0.52,
                                        status: .worthTheDrive,
                                        distanceBasis: .roadRoute)
-        XCTAssertEqual(saving.headline(), "£0.52 better off after travel")
+        XCTAssertEqual(saving.headline(), "Save £0.52")
 
         let loss = FuelSavingsResult(fillLitres: 34.9,
                                      grossSavingGBP: 1.40,
@@ -422,7 +458,7 @@ final class FuelSavingsEstimateTests: XCTestCase {
                                      netSavingGBP: -0.31,
                                      status: .notWorthTheDrive,
                                      distanceBasis: .roadRoute)
-        XCTAssertEqual(loss.headline(), "£0.31 worse off after travel")
+        XCTAssertEqual(loss.headline(), "Costs £0.31 more")
     }
 
     /// The sort must order by NET saving, not pump price: a pricier station can
@@ -454,6 +490,25 @@ final class FuelSavingsEstimateTests: XCTestCase {
 
     // MARK: Row copy
 
+    func testCompactComparisonLabelUsesGenericNearestStationWording() {
+        XCTAssertEqual(
+            FuelSavingsFormat.comparisonLabel(status: .worthTheDrive),
+            "vs closest station"
+        )
+        XCTAssertEqual(
+            FuelSavingsFormat.comparisonLabel(status: .notWorthTheDrive),
+            "vs closest station"
+        )
+        XCTAssertEqual(
+            FuelSavingsFormat.comparisonLabel(status: .breakEven),
+            "vs closest station"
+        )
+        XCTAssertEqual(
+            FuelSavingsFormat.comparisonLabel(status: .baseline),
+            "your baseline"
+        )
+    }
+
     /// The row's extra-driving caption must follow the DISPLAY unit: the stored
     /// figure is always miles, and converting by the current unit instead would
     /// leave a km user's figure unlabelled and 1.6× too large.
@@ -486,7 +541,7 @@ final class FuelSavingsEstimateTests: XCTestCase {
             netSavingGBP: 0,
             status: .baseline
         )
-        XCTAssertEqual(baseline.capsuleHeadline(), "Closest station · your baseline")
+        XCTAssertEqual(baseline.capsuleHeadline(), "Closest station")
 
         let saving = FuelSavingsResult(
             fillLitres: 30,
@@ -497,7 +552,7 @@ final class FuelSavingsEstimateTests: XCTestCase {
             status: .worthTheDrive,
             distanceBasis: .straightLine
         )
-        XCTAssertEqual(saving.capsuleHeadline(), "Approx. £1.00 better off after travel")
+        XCTAssertEqual(saving.capsuleHeadline(), "Approx. Save £1.00")
 
         let worse = FuelSavingsResult(
             fillLitres: 30,
@@ -507,7 +562,7 @@ final class FuelSavingsEstimateTests: XCTestCase {
             netSavingGBP: -0.31,
             status: .notWorthTheDrive
         )
-        XCTAssertEqual(worse.capsuleHeadline(), "£0.31 worse off after travel")
+        XCTAssertEqual(worse.capsuleHeadline(), "Costs £0.31 more")
     }
 
     // MARK: - Estimate wording (Approx. labels)
@@ -524,7 +579,7 @@ final class FuelSavingsEstimateTests: XCTestCase {
             status: .worthTheDrive,
             distanceBasis: .straightLine
         )
-        XCTAssertEqual(saving.headline(), "Approx. £1.25 better off after travel")
+        XCTAssertEqual(saving.headline(), "Approx. Save £1.25")
 
         let loss = FuelSavingsResult(
             fillLitres: 30,
@@ -535,7 +590,7 @@ final class FuelSavingsEstimateTests: XCTestCase {
             status: .notWorthTheDrive,
             distanceBasis: .straightLine
         )
-        XCTAssertEqual(loss.headline(), "Approx. £0.77 worse off after travel")
+        XCTAssertEqual(loss.headline(), "Approx. Costs £0.77 more")
     }
 
     /// A confirmed road-route comparison must never carry the marker — in either
@@ -551,7 +606,7 @@ final class FuelSavingsEstimateTests: XCTestCase {
             distanceBasis: .roadRoute,
             journeyConfidence: .confirmed
         )
-        XCTAssertEqual(saving.headline(), "£1.25 better off after travel")
+        XCTAssertEqual(saving.headline(), "Save £1.25")
 
         let loss = FuelSavingsResult(
             fillLitres: 30,
@@ -563,7 +618,7 @@ final class FuelSavingsEstimateTests: XCTestCase {
             distanceBasis: .roadRoute,
             journeyConfidence: .confirmed
         )
-        XCTAssertEqual(loss.headline(), "£0.77 worse off after travel")
+        XCTAssertEqual(loss.headline(), "Costs £0.77 more")
 
         for headline in [saving.headline(), loss.headline(), saving.capsuleHeadline()] {
             XCTAssertFalse(headline.contains("Approx"), "\"\(headline)\" must not claim to be an estimate")
@@ -585,6 +640,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() {
@@ -597,7 +675,7 @@ final class FuelSavingsEstimateTests: XCTestCase {
             status: .notWorthTheDrive,
             distanceBasis: .straightLine
         )
-        XCTAssertEqual(estimated.spokenHeadline(), "Approximately £0.77 worse off after travel")
+        XCTAssertEqual(estimated.spokenHeadline(), "Approximately Costs £0.77 more")
 
         XCTAssertEqual(
             FuelSavingsFormat.extraTravelSpokenLabel(extraDistanceMiles: 6.4, unit: .miles, confidence: .estimated),

FuelBoardTests/Tests/FuelBoardSharedTests/FuelSavingsTests.swift

@@ -8,15 +8,15 @@ final class FuelSavingsCalculatorTests: XCTestCase {
         XCTAssertEqual(FuelSavingsCalculator.fuelUsedLitres(distanceMiles: 10, mpg: 45), 1.0102, accuracy: 0.0001)
     }
 
-    func testPoundsBudgetConvertsToLitresUsingBaselinePrice() throws {
+    func testPoundsBudgetConvertsToLitresUsingGivenPrice() throws {
         let amount = FuelSavingsFillAmount(value: 40, unit: .pounds)
-        let litres = try FuelSavingsCalculator.fillLitres(amount: amount, baselinePricePencePerLitre: 160)
+        let litres = try FuelSavingsCalculator.fillLitres(amount: amount, pricePencePerLitre: 160)
         XCTAssertEqual(litres, 25.0, accuracy: 0.0001)
     }
 
     func testLitresAmountPassesThrough() throws {
         let amount = FuelSavingsFillAmount(value: 35, unit: .litres)
-        let litres = try FuelSavingsCalculator.fillLitres(amount: amount, baselinePricePencePerLitre: 160)
+        let litres = try FuelSavingsCalculator.fillLitres(amount: amount, pricePencePerLitre: 160)
         XCTAssertEqual(litres, 35, accuracy: 0.0001)
     }
 
@@ -29,11 +29,11 @@ final class FuelSavingsCalculatorTests: XCTestCase {
             baselineJourneyMiles: 2,
             candidateJourneyMiles: 8
         )
-        XCTAssertEqual(result.fillLitres, 25, accuracy: 0.0001)
+        XCTAssertEqual(result.fillLitres, 26.6667, accuracy: 0.0001)
-        XCTAssertEqual(result.grossSavingGBP, 2.50, accuracy: 0.0001)
+        XCTAssertEqual(result.grossSavingGBP, 2.6667, accuracy: 0.0001)
         XCTAssertEqual(result.extraDistanceMiles, 6, accuracy: 0.0001)
         XCTAssertEqual(result.extraDrivingCostGBP, 0.9092, accuracy: 0.0001)
-        XCTAssertEqual(result.netSavingGBP, 1.5908, accuracy: 0.0001)
+        XCTAssertEqual(result.netSavingGBP, 1.7574, accuracy: 0.0001)
         XCTAssertEqual(result.status, .worthTheDrive)
     }
 
@@ -61,7 +61,7 @@ final class FuelSavingsCalculatorTests: XCTestCase {
     }
 
     func testInvalidInputsRejected() {
-        XCTAssertThrowsError(try FuelSavingsCalculator.fillLitres(amount: FuelSavingsFillAmount(value: 40, unit: .pounds), baselinePricePencePerLitre: 0))
+        XCTAssertThrowsError(try FuelSavingsCalculator.fillLitres(amount: FuelSavingsFillAmount(value: 40, unit: .pounds), pricePencePerLitre: 0))
         XCTAssertThrowsError(try FuelSavingsCalculator.calculate(mpg: 0, amount: FuelSavingsFillAmount(value: 40, unit: .pounds), baselinePricePencePerLitre: 160, candidatePricePencePerLitre: 150, baselineJourneyMiles: 1, candidateJourneyMiles: 2))
         XCTAssertThrowsError(try FuelSavingsCalculator.calculate(mpg: 500, amount: FuelSavingsFillAmount(value: 40, unit: .pounds), baselinePricePencePerLitre: 160, candidatePricePencePerLitre: 150, baselineJourneyMiles: 1, candidateJourneyMiles: 2))
     }
@@ -143,6 +143,15 @@ final class FuelSavingsCalculatorTests: XCTestCase {
 }
 
 final class FuelSavingsSettingsTests: XCTestCase {
+    func testSwitchingFillUnitStartsAnExplicitNewComparison() {
+        let budget = FuelSavingsFillAmount(value: 60, unit: .pounds)
+        let litres = FuelSavingsCalculator.newComparisonAmount(afterSwitching: budget, to: .litres)
+        XCTAssertEqual(litres, FuelSavingsFillAmount(value: 30, unit: .litres))
+        XCTAssertEqual(FuelSavingsCalculator.newComparisonAmount(afterSwitching: litres, to: .pounds),
+                       FuelSavingsFillAmount(value: 40, unit: .pounds))
+        XCTAssertEqual(FuelSavingsCalculator.newComparisonAmount(afterSwitching: budget, to: .pounds), budget)
+    }
+
     func testSettingsValidationRequiresEnabledMPGAndFillAmount() {
         XCTAssertFalse(FuelSavingsSettings(enabled: false, mpg: 45, preferredAmount: .init(value: 40, unit: .pounds)).isConfigured)
         XCTAssertFalse(FuelSavingsSettings(enabled: true, mpg: 0, preferredAmount: .init(value: 40, unit: .pounds)).isConfigured)
@@ -150,3 +159,101 @@ final class FuelSavingsSettingsTests: XCTestCase {
         XCTAssertTrue(FuelSavingsSettings(enabled: true, mpg: 45, preferredAmount: .init(value: 40, unit: .pounds)).isConfigured)
     }
 }
+
+/// The row's single recommendation badge. Presentation only, but the rules are
+/// worth pinning: they decide which of two true statements a row makes, and
+/// "no badge" is itself an answer.
+final class StationRecommendationBadgeTests: XCTestCase {
+    private let threshold = 1.0
+
+    func testSavingAtTheThresholdEarnsBestValue() {
+        XCTAssertEqual(
+            StationRecommendationBadge.badge(netSavingGBP: 1.0, isCheapest: false,
+                                             bestValueThresholdGBP: threshold),
+            .bestValue
+        )
+    }
+
+    func testSavingBelowTheThresholdDoesNot() {
+        XCTAssertNil(
+            StationRecommendationBadge.badge(netSavingGBP: 0.42, isCheapest: false,
+                                             bestValueThresholdGBP: threshold)
+        )
+    }
+
+    func testCheapestWithoutAWorthwhileSavingStillSaysCheapest() {
+        XCTAssertEqual(
+            StationRecommendationBadge.badge(netSavingGBP: 0.42, isCheapest: true,
+                                             bestValueThresholdGBP: threshold),
+            .cheapest
+        )
+    }
+
+    /// The cheapest station keeps its badge even when the drive costs more than
+    /// the saving buys — it IS the cheapest price; the capsule underneath is
+    /// what says the trip is not worth it.
+    func testCheapestKeepsItsBadgeWhenTheDriveCostsMoreThanItSaves() {
+        XCTAssertEqual(
+            StationRecommendationBadge.badge(netSavingGBP: -14.30, isCheapest: true,
+                                             bestValueThresholdGBP: threshold),
+            .cheapest
+        )
+    }
+
+    /// One badge per row: the stronger statement wins.
+    func testBestValueOutranksCheapestWhenBothApply() {
+        XCTAssertEqual(
+            StationRecommendationBadge.badge(netSavingGBP: 3.15, isCheapest: true,
+                                             bestValueThresholdGBP: threshold),
+            .bestValue
+        )
+    }
+
+    /// A near-by station with no saving to speak of is context, not a
+    /// recommendation — the mockup gives NEAREST no capsule, and nothing else
+    /// here may invent one.
+    func testNoSavingAndNotCheapestMeansNoBadge() {
+        XCTAssertNil(
+            StationRecommendationBadge.badge(netSavingGBP: 0.0, isCheapest: false,
+                                             bestValueThresholdGBP: threshold)
+        )
+        XCTAssertNil(
+            StationRecommendationBadge.badge(netSavingGBP: -2.50, isCheapest: false,
+                                             bestValueThresholdGBP: threshold)
+        )
+    }
+
+    func testUnavailableSavingsLeaveOnlyTheCheapestBadge() {
+        XCTAssertEqual(
+            StationRecommendationBadge.badge(netSavingGBP: nil, isCheapest: true,
+                                             bestValueThresholdGBP: threshold),
+            .cheapest
+        )
+        XCTAssertNil(
+            StationRecommendationBadge.badge(netSavingGBP: nil, isCheapest: false,
+                                             bestValueThresholdGBP: threshold)
+        )
+    }
+
+    /// A rubbish figure must not become a recommendation.
+    func testNonFiniteFiguresProduceNoBadge() {
+        XCTAssertNil(
+            StationRecommendationBadge.badge(netSavingGBP: .nan, isCheapest: false,
+                                             bestValueThresholdGBP: threshold)
+        )
+        XCTAssertNil(
+            StationRecommendationBadge.badge(netSavingGBP: 5.0, isCheapest: false,
+                                             bestValueThresholdGBP: .nan)
+        )
+    }
+
+    /// The threshold is the user's alert setting: set it to zero and any saving
+    /// that is not a loss counts.
+    func testZeroThresholdAwardsBestValueToAnyNonNegativeSaving() {
+        XCTAssertEqual(
+            StationRecommendationBadge.badge(netSavingGBP: 0, isCheapest: false,
+                                             bestValueThresholdGBP: 0),
+            .bestValue
+        )
+    }
+}

FuelBoardTests/Tests/FuelBoardSharedTests/FuelStoreTests.swift

@@ -0,0 +1,33 @@
+import XCTest
+#if SWIFT_PACKAGE
+@testable import FuelBoardShared
+#endif
+
+/// The Best Value gate's option list.
+///
+/// This one array is the figure behind two user-facing things — the BEST VALUE
+/// badge on a station row and the proximity alert — so its granularity is a
+/// setting, not an implementation detail. It was four coarse values (50p, £1,
+/// £2, £5); these tests pin the 50p step and the £5 ceiling so a later edit
+/// cannot quietly coarsen it back.
+final class FuelStoreBestValueThresholdTests: XCTestCase {
+    func testOptionsStepByFiftyPenceUpToFivePounds() {
+        let options = FuelStore.bestValueAlertThresholdOptionsGBP
+        XCTAssertEqual(options, [0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0])
+        XCTAssertEqual(options.count, 10)
+        XCTAssertEqual(options.first, 0.5, "the floor is the cheapest worth-the-drive saving offered")
+        XCTAssertEqual(options.last, 5.0, "£5 is the ceiling")
+    }
+
+    /// The store writes the threshold as a string and, on load, rejects any
+    /// value that is not one of these options — falling back to the £1 default.
+    /// So an option that does not survive `String` → `Double` exactly would
+    /// silently discard the user's choice. Multiples of 0.5 are exactly
+    /// representable in binary, and this keeps them that way.
+    func testEveryOptionSurvivesTheStoresStringRoundTrip() {
+        for option in FuelStore.bestValueAlertThresholdOptionsGBP {
+            XCTAssertEqual(Double(String(option)), option,
+                           "£\(option) does not round-trip through the store's string encoding")
+        }
+    }
+}

FuelBoardTests/Tests/FuelBoardSharedTests/StationPriceAgePolicyTests.swift

@@ -0,0 +1,219 @@
+import XCTest
+#if SWIFT_PACKAGE
+@testable import FuelBoardShared
+#endif
+
+/// Regression: a station's price age never removes it from Best Value.
+///
+/// The relay publishes one `price_updated` per station — the newest
+/// `price_last_updated` across the grades it maps — which cannot vouch for the
+/// selected grade. It is therefore display-only: Best Value, Cheapest and
+/// Closest rank stations on their prices and distances exactly as before,
+/// whether the timestamp is minutes, months or absent.
+final class StationPriceAgePolicyTests: XCTestCase {
+    private let now = Date(timeIntervalSince1970: 1_800_000_000)
+    private let settings = FuelSavingsSettings(
+        enabled: true,
+        mpg: 30,
+        preferredAmount: FuelSavingsFillAmount(value: 60, unit: .pounds)
+    )
+
+    private func station(_ id: String,
+                         price: Double,
+                         fuel: FuelType = .e10,
+                         ageDays: Double?,
+                         lat: Double = 53,
+                         lng: Double = -1) -> FuelStation {
+        FuelStation(
+            id: id, name: id, brand: "X", address: "", postcode: "", lat: lat, lng: lng,
+            prices: [fuel: price],
+            priceUpdated: ageDays.map { now.addingTimeInterval(-$0 * 86_400).timeIntervalSince1970 }
+        )
+    }
+
+    private func straightLine(_ miles: Double) -> FuelSavingsJourney {
+        FuelSavingsJourney(miles: miles, basis: .straightLine)
+    }
+
+    private func distanceProvider(_ miles: [String: Double]) -> (FuelStation) -> FuelSavingsJourney? {
+        { station in miles[station.id].map { self.straightLine($0) } }
+    }
+
+    // MARK: - The baseline is the closest seller, whatever its age
+
+    func testClosestSellerIsTheBaselineEvenWhenItsTimestampIsAncient() {
+        let ancientClosest = station("ancient-closest", price: 199.9, ageDays: 250)
+        let freshFurther = station("fresh-further", price: 170.9, ageDays: 1)
+        let journeys = distanceProvider(["ancient-closest": 0.8, "fresh-further": 3.0])
+
+        XCTAssertEqual(
+            FuelSavingsEstimator.baselineStation([ancientClosest, freshFurther], fuel: .e10,
+                                                 journeyMiles: journeys)?.id,
+            "ancient-closest",
+            "the baseline is the closest station selling the selected fuel — age is not a criterion"
+        )
+    }
+
+    func testBaselineStillRequiresTheSelectedFuelAndAUsableJourney() {
+        let wrongFuel = station("wrong-fuel", price: 140, fuel: .diesel, ageDays: 1)
+        let unusableJourney = station("bad-journey", price: 141, ageDays: 1)
+        let sellsFuel = station("sells-fuel", price: 145, ageDays: 1)
+        let journeys = distanceProvider(["wrong-fuel": 0.1, "sells-fuel": 2.0])  // bad-journey has none
+
+        XCTAssertEqual(
+            FuelSavingsEstimator.baselineStation([wrongFuel, unusableJourney, sellsFuel], fuel: .e10,
+                                                 journeyMiles: journeys)?.id,
+            "sells-fuel"
+        )
+    }
+
+    // MARK: - Old, missing and invalid timestamps still rank
+
+    func testOldPriceTimestampsRankByNetSavingForEveryFuel() {
+        for fuel in FuelType.allCases {
+            let base = station("base", price: 199.9, fuel: fuel, ageDays: 250)
+            let cheap = station("cheap", price: 129.9, fuel: fuel, ageDays: 250)
+            let dear = station("dear", price: 198.9, fuel: fuel, ageDays: 250)
+            let journeys = distanceProvider(["base": 0.8, "cheap": 1.2, "dear": 1.0])
+
+            let ranked = FuelSavingsEstimator.ranked([dear, cheap, base], fuel: fuel, baseline: base,
+                                                     settings: settings, amount: settings.preferredAmount,
+                                                     journeyMiles: journeys)
+
+            XCTAssertEqual(ranked.map(\.id), ["cheap", "dear", "base"], fuel.rawValue)
+            let saving = FuelSavingsEstimator.availability(
+                station: cheap, fuel: fuel, baseline: base, settings: settings,
+                amount: settings.preferredAmount, journey: straightLine(1.2), baselineJourney: straightLine(0.8)
+            )?.result
+            XCTAssertGreaterThan(saving?.netSavingGBP ?? -1, 0,
+                                 "\(fuel.rawValue): a 250-day-old price still produces a saving")
+        }
+    }
+
+    func testNetSavingStillOutranksPumpPriceWhenTimestampsAreOld() {
+        // Net saving decides the order: the cheapest station is 30 miles away,
+        // so a pricier one a mile from home wins. Nothing here consults the age.
+        let base = station("base", price: 171.9, ageDays: 120)
+        let cheapFar = station("cheap-far", price: 169.9, ageDays: 250)
+        let pricierNear = station("pricier-near", price: 170.9, ageDays: 200)
+        let journeys = distanceProvider(["base": 0.8, "cheap-far": 30, "pricier-near": 1.2])
+
+        let ranked = FuelSavingsEstimator.ranked([cheapFar, pricierNear, base], fuel: .e10, baseline: base,
+                                                 settings: settings, amount: settings.preferredAmount,
+                                                 journeyMiles: journeys)
+
+        XCTAssertEqual(ranked.map(\.id), ["pricier-near", "base", "cheap-far"])
+        XCTAssertEqual(ranked.first?.prices[.e10], 170.9, "the winner is chosen on net saving, not pump price")
+    }
+
+    func testMissingFutureAndAbsurdTimestampsDoNotRemoveStations() {
+        let invalid = FuelStation(id: "absurd", name: "Absurd", brand: "", address: "", postcode: "",
+                                  lat: 53, lng: -1, prices: [.e10: 150.9],
+                                  priceUpdated: -Double.greatestFiniteMagnitude)
+        let pool = [station("base", price: 199.9, ageDays: 250),
+                    station("cheap", price: 129.9, ageDays: 100),
+                    FuelStation(id: "future", name: "Future", brand: "", address: "", postcode: "",
+                                lat: 53, lng: -1, prices: [.e10: 160.9],
+                                priceUpdated: now.addingTimeInterval(86_400).timeIntervalSince1970),
+                    station("undated", price: 170.9, ageDays: nil),
+                    invalid]
+        let journeys = distanceProvider(["base": 0.8, "cheap": 1.2, "future": 1.6,
+                                         "undated": 2.0, "absurd": 2.8])
+
+        let ranked = FuelSavingsEstimator.ranked(pool, fuel: .e10, baseline: pool[0],
+                                                 settings: settings, amount: settings.preferredAmount,
+                                                 journeyMiles: journeys)
+
+        XCTAssertEqual(Set(ranked.map(\.id)), Set(pool.map(\.id)),
+                       "every station stays in the pool: no timestamp can filter a row out")
+        XCTAssertEqual(ranked.first?.id, "cheap", "the cheapest station still wins")
+    }
+
+    func testEveryPricedStationKeepsAResultWhateverItsTimestamp() {
+        let pool = [
+            station("base", price: 199.9, ageDays: 1),
+            station("fresh", price: 180.9, ageDays: 1),
+            station("old", price: 175.9, ageDays: 40),
+            station("ancient", price: 170.9, ageDays: 250),
+            station("undated", price: 165.9, ageDays: nil)
+        ]
+        let journeys = distanceProvider(["base": 0.8, "fresh": 1.0, "old": 1.4, "ancient": 1.8, "undated": 2.2])
+
+        let ranked = FuelSavingsEstimator.ranked(pool, fuel: .e10, baseline: pool[0],
+                                                 settings: settings, amount: settings.preferredAmount,
+                                                 journeyMiles: journeys)
+
+        XCTAssertEqual(ranked.map(\.id).sorted(), ["ancient", "base", "fresh", "old", "undated"])
+        for station in pool {
+            let result = FuelSavingsEstimator.availability(
+                station: station, fuel: .e10, baseline: pool[0], settings: settings,
+                amount: settings.preferredAmount,
+                journey: journeys(station), baselineJourney: straightLine(0.8)
+            )?.result
+            XCTAssertNotNil(result, "\(station.id) still shows a Best Value row")
+        }
+    }
+
+    func testCheapestAndClosestOrdersAreUnaffectedByTimestampAge() {
+        // Cheapest sorts on pump price, Closest on distance — the only inputs are
+        // prices and distances, so no age combination changes either order.
+        let specs: [(String, Double, Double)] = [("a", 199.9, 0.8), ("b", 129.9, 30), ("c", 170.9, 1.2)]
+        for ages in [[1.0, 1.0, 1.0], [250.0, 250.0, 250.0]] {
+            let pool = zip(specs, ages).map { spec, age in
+                station(spec.0, price: spec.1, ageDays: age)
+            }
+            let journeys = distanceProvider(Dictionary(uniqueKeysWithValues:
+                zip(specs.map(\.0), specs.map(\.2))))
+
+            let cheapestFirst = pool.sorted { lhs, rhs in
+                let left = lhs.prices[.e10] ?? .infinity
+                let right = rhs.prices[.e10] ?? .infinity
+                if left != right { return left < right }
+                return (journeys(lhs)?.miles ?? .infinity) < (journeys(rhs)?.miles ?? .infinity)
+            }
+            XCTAssertEqual(cheapestFirst.map(\.id), ["b", "c", "a"])
+
+            let closestFirst = pool.sorted { lhs, rhs in
+                let left = journeys(lhs)?.miles ?? .infinity
+                let right = journeys(rhs)?.miles ?? .infinity
+                if left != right { return left < right }
+                return (lhs.prices[.e10] ?? .infinity) < (rhs.prices[.e10] ?? .infinity)
+            }
+            XCTAssertEqual(closestFirst.map(\.id), ["a", "c", "b"])
+        }
+    }
+
+    // MARK: - The bundled / offline dataset
+
+    func testBundledDatasetWithMonthOldTimestampsStillRecommendsBestValue() {
+        // The bundled dump ships one pull of the whole UK feed, so every station
+        // arrives with the same months-old timestamp. Best Value must still
+        // recommend — it used to read "unavailable" for the entire offline list.
+        var specs: [(String, Double, Double, Double?)] = [("base", 171.9, 0.8, 90),
+                                                          ("pricier-near", 170.9, 1.2, 200),
+                                                          ("cheap-far", 149.9, 40, 250),
+                                                          ("dear-near", 179.9, 1.6, nil),
+                                                          ("old-undated", 160.9, 5.0, 240)]
+        let pool = specs.map { station($0.0, price: $0.1, ageDays: $0.3) }
+        let journeys = distanceProvider(Dictionary(uniqueKeysWithValues:
+            specs.map { ($0.0, $0.2) }))
+
+        let ranked = FuelSavingsEstimator.ranked(pool, fuel: .e10, baseline: pool[0],
+                                                 settings: settings, amount: settings.preferredAmount,
+                                                 journeyMiles: journeys)
+
+        let savings = pool.map { station in
+            (station.id, FuelSavingsEstimator.availability(
+                station: station, fuel: .e10, baseline: pool[0], settings: settings,
+                amount: settings.preferredAmount, journey: journeys(station), baselineJourney: straightLine(0.8)
+            )?.result?.netSavingGBP ?? -Double.infinity)
+        }
+        let expectedWinner = savings.max { $0.1 < $1.1 }?.0
+
+        XCTAssertEqual(ranked.first?.id, expectedWinner,
+                       "the offline list is still ordered by net saving")
+        XCTAssertNotNil(ranked.first?.prices[.e10], "the top station has a price to show")
+        XCTAssertGreaterThan(savings.first { $0.0 == expectedWinner }?.1 ?? -1, 0,
+                             "and that recommendation carries a real saving")
+    }
+}

FuelBoardWatch Watch App/ContentView.swift

@@ -51,7 +51,7 @@ private enum WatchDistanceUnit: String, Codable {
     func format(km: Double) -> String {
         switch self {
         case .miles:
-            return String(format: "%.1f mi", km * 0.621371)
+            return String(format: "%.1f mi", km / 1.609344)
         case .kilometers:
             return String(format: "%.1f km", km)
         }

FuelBoardWidgets/FuelPriceWidget.swift

@@ -95,7 +95,8 @@ struct FuelPriceTimelineProvider<Configuration: WidgetConfigurationIntent & Widg
             data: FuelPriceWidgetEntryData(
                 date: Date(), stations: Array(sample.prefix(8)),
                 fuel: .e10, sort: .cheapest, isFavourites: false,
-                location: nil, locationSource: "none", unit: unit
+                location: nil, locationSource: "none", unit: unit,
+                bestValueResult: nil
             )
         )
     }
@@ -146,8 +147,9 @@ struct FuelPriceTimelineProvider<Configuration: WidgetConfigurationIntent & Widg
         // Per-widget config: fuel + sort + distance come from THIS widget instance.
         let fuel = FuelType(rawValue: configuration.fuel.rawValue) ?? .e10
         let isFavourites = configuration.sort == .favourites
-        let sort: SortMode = configuration.sort == .closest ? .closest : .cheapest
+        let sort: SortMode = configuration.sort == .closest ? .closest :
-        let radiusKM = Double(configuration.distance.miles) * 1.60934
+            (configuration.sort == .worthTheDrive ? .worthTheDrive : .cheapest)
+        let radiusKM = Double(configuration.distance.miles) * FuelSavingsCalculator.kilometresPerMile
 
         // 1) Try a fresh location fix (bounded to a few seconds). The fix's own
         // accuracy is kept: the extension runs its own CLLocationManager and is
@@ -200,6 +202,7 @@ struct FuelPriceTimelineProvider<Configuration: WidgetConfigurationIntent & Widg
 
         // 3) Load + order stations per widget mode.
         let ordered: [FuelStation]
+        var bestValueResult: FuelSavingsResult?
         if isFavourites {
             let favourites = FuelStore.loadFavourites()
                 .filter { $0.station.prices[$0.fuel] != nil }
@@ -265,7 +268,7 @@ struct FuelPriceTimelineProvider<Configuration: WidgetConfigurationIntent & Widg
             let filtered = stations.filter { $0.prices[fuel] != nil }
             switch sort {
             case .closest:
-                // Nearest first; price only breaks ties.
+                // Closest first; price only breaks ties.
                 ordered = filtered.sorted { lhs, rhs in
                     if let origin {
                         let lDist = FuelStore.displayDistanceKM(station: lhs, userLat: origin.lat, userLng: origin.lng)
@@ -274,9 +277,59 @@ struct FuelPriceTimelineProvider<Configuration: WidgetConfigurationIntent & Widg
                     }
                     return lhs.prices[fuel]! < rhs.prices[fuel]!
                 }
-            case .cheapest, .worthTheDrive:
+            case .worthTheDrive:
-                // Cheapest first; distance only breaks ties. Worth-the-Drive is app-only;
+                guard let origin else {
-                // widgets fall back to cheapest ordering if a stored config ever carries it.
+                    ordered = filtered.sorted { $0.prices[fuel]! < $1.prices[fuel]! }
+                    break
+                }
+                let journey: (FuelStation) -> FuelSavingsJourney? = { station in
+                    if let meters = FuelStore.roadJourneyMeters(for: station, userLat: origin.lat, userLng: origin.lng) {
+                        let confidence: JourneyConfidence = FuelStore.hasMeasuredReturnRoadDistance(
+                            for: station, userLat: origin.lat, userLng: origin.lng
+                        ) ? .confirmed : .estimated
+                        return FuelSavingsJourney(
+                            miles: meters / FuelSavingsCalculator.metresPerMile,
+                            basis: .roadRoute,
+                            confidence: confidence
+                        )
+                    }
+                    return FuelSavingsJourney(
+                        miles: FuelStore.displayDistanceKM(station: station, userLat: origin.lat, userLng: origin.lng) /
+                            FuelSavingsCalculator.kilometresPerMile * 2,
+                        basis: .straightLine,
+                        confidence: .estimated
+                    )
+                }
+                let settings = FuelStore.loadFuelSavingsSettings()
+                guard settings.isConfigured else {
+                    ordered = filtered.sorted { $0.prices[fuel]! < $1.prices[fuel]! }
+                    break
+                }
+                let amount = settings.preferredAmount
+                let baseline = FuelSavingsEstimator.baselineStation(filtered, fuel: fuel, journeyMiles: journey)
+                let ranked = FuelSavingsEstimator.ranked(
+                    filtered,
+                    fuel: fuel,
+                    baseline: baseline,
+                    settings: settings,
+                    amount: amount,
+                    journeyMiles: journey
+                )
+                ordered = ranked
+                if let first = ranked.first, let baseline {
+                    let baselineJourney = journey(baseline)
+                    let result = FuelSavingsEstimator.availability(
+                        station: first,
+                        fuel: fuel,
+                        baseline: baseline,
+                        settings: settings,
+                        amount: amount,
+                        journey: journey(first),
+                        baselineJourney: baselineJourney
+                    )
+                    bestValueResult = result?.result
+                }
+            case .cheapest:
                 ordered = filtered.sorted { lhs, rhs in
                     let lPrice = lhs.prices[fuel]!
                     let rPrice = rhs.prices[fuel]!
@@ -295,7 +348,7 @@ struct FuelPriceTimelineProvider<Configuration: WidgetConfigurationIntent & Widg
                 date: Date(), stations: Array(ordered.prefix(8)),
                 fuel: fuel, sort: sort, isFavourites: isFavourites,
                 location: origin, locationSource: source,
-                unit: unit
+                unit: unit, bestValueResult: bestValueResult
             )
         ), originSource)
     }

FuelBoardWidgets/WidgetConfigIntent.swift

@@ -30,6 +30,7 @@ enum WidgetFuel: String, AppEnum, CaseIterable, Codable {
 enum WidgetSort: String, AppEnum, CaseIterable, Codable {
     case cheapest
     case closest
+    case worthTheDrive
     case favourites
 
     static var typeDisplayRepresentation: TypeDisplayRepresentation = "Sort by"
@@ -37,6 +38,7 @@ enum WidgetSort: String, AppEnum, CaseIterable, Codable {
     static var caseDisplayRepresentations: [WidgetSort: DisplayRepresentation] = [
         .cheapest: "Cheapest",
         .closest: "Closest",
+        .worthTheDrive: "Best Value",
         .favourites: "Favourites",
     ]
 }
@@ -112,9 +114,17 @@ struct FuelBoardWidgetConfigurationIntent: WidgetConfigurationIntent, WidgetConf
                     \.$sort
                 }
             } otherwise: {
-                Summary("Show \(\.$fuel) by \(\.$sort)") {
+                When(\.$sort, .equalTo, WidgetSort.worthTheDrive) {
-                    \.$fuel
+                    Summary("Show \(\.$fuel) by \(\.$sort) within \(\.$distance)") {
-                    \.$sort
+                        \.$fuel
+                        \.$sort
+                        \.$distance
+                    }
+                } otherwise: {
+                    Summary("Show \(\.$fuel) by \(\.$sort)") {
+                        \.$fuel
+                        \.$sort
+                    }
                 }
             }
         }

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/FuelPriceFreshness.swift

@@ -0,0 +1,101 @@
+import Foundation
+
+enum FuelPriceTimestamp {
+    static func parse(_ value: String?) -> Date? {
+        guard let value, !value.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else { return nil }
+        let formatter = ISO8601DateFormatter()
+        formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+        return formatter.date(from: value) ?? {
+            formatter.formatOptions = [.withInternetDateTime]
+            return formatter.date(from: value)
+        }()
+    }
+}
+
+/// Station-level price freshness — informational only.
+///
+/// The relay publishes ONE `price_updated` per station, derived from the
+/// GOV.UK Fuel Finder field `price_last_updated` as the MAXIMUM across the
+/// fuel grades it maps. It is therefore a station-level figure and never a
+/// verified timestamp for the grade the user has selected, so every label
+/// describes the station's price information rather than one fuel.
+///
+/// Age excludes nothing: a station with a valid price is ranked on that price
+/// however old its timestamp is. `outdatedAge` only decides whether More info
+/// adds a discreet "May be outdated" note.
+enum FuelPriceFreshness {
+    /// Price information older than this is flagged as possibly out of date.
+    /// A display threshold only — it gates nothing.
+    static let outdatedAge: TimeInterval = 30 * 24 * 60 * 60
+    /// Tolerated clock skew. A timestamp further into the future than this is
+    /// unusable (a feed error), never silently treated as "just now".
+    static let futureTolerance: TimeInterval = 5 * 60
+    /// Ages beyond this are unusable rather than displayed. It also keeps the
+    /// day count inside `Int`, so an absurd epoch cannot trap.
+    static let maximumAge: TimeInterval = 365 * 24 * 60 * 60 * 10
+
+    enum Status: Equatable {
+        /// Readable timestamp within `outdatedAge`.
+        case fresh
+        /// Readable timestamp older than `outdatedAge`.
+        case outdated
+        /// The record carries no timestamp.
+        case unknown
+        /// A timestamp is present but unreadable, or implausibly in the future.
+        case invalid
+    }
+
+    struct Assessment: Equatable {
+        let status: Status
+        /// Age in seconds. nil exactly when the timestamp is unusable, so no
+        /// caller can print an age that was never measured.
+        let age: TimeInterval?
+
+        var isOutdated: Bool { status == .outdated }
+
+        /// The one age More info reports. Missing or unreadable timestamps read
+        /// "Not provided" rather than implying freshness.
+        var updateAgeLabel: String {
+            guard let age else {
+                return String(localized: "Not provided", comment: "Price update time is missing")
+            }
+            return String(format: String(localized: "%@ ago", comment: "Price age, e.g. 28h ago"),
+                          Self.ageText(age))
+        }
+
+        /// Discreet flag for price information past `outdatedAge`. nil while the
+        /// information is fresh, and nil when there is nothing to measure.
+        var outdatedNotice: String? {
+            guard status == .outdated else { return nil }
+            return String(localized: "May be outdated",
+                          comment: "Station price information older than 30 days")
+        }
+
+        /// Compact age: minutes under an hour, hours under two days, then days.
+        static func ageText(_ age: TimeInterval) -> String {
+            let minutes = max(0, Int(age / 60))
+            if minutes < 60 { return "\(minutes)m" }
+            let hours = minutes / 60
+            if hours < 48 { return "\(hours)h" }
+            return "\(hours / 24)d"
+        }
+    }
+
+    /// The station's own timestamp. Deliberately takes no fuel: there is one
+    /// figure per station and every grade reads the same one, so the policy
+    /// cannot differ between fuels.
+    static func assessment(for station: FuelStation, now: Date = Date()) -> Assessment {
+        assessment(priceUpdated: station.priceUpdated, now: now)
+    }
+
+    static func assessment(priceUpdated: TimeInterval?, now: Date = Date()) -> Assessment {
+        guard let priceUpdated else { return Assessment(status: .unknown, age: nil) }
+        guard priceUpdated.isFinite else { return Assessment(status: .invalid, age: nil) }
+        let age = now.timeIntervalSince1970 - priceUpdated
+        guard age.isFinite, age >= -futureTolerance, age <= maximumAge else {
+            return Assessment(status: .invalid, age: nil)
+        }
+        let boundedAge = max(0, age)
+        return Assessment(status: boundedAge > outdatedAge ? .outdated : .fresh, age: boundedAge)
+    }
+}

Shared/FuelPriceProvider.swift

@@ -38,7 +38,7 @@ enum FuelPriceProvider {
                 lat: relay.lat ?? 0,
                 lng: relay.lng ?? 0,
                 prices: relay.allPrices,
-                priceUpdated: nil
+                priceUpdated: relay.priceUpdatedDate?.timeIntervalSince1970
             )
         }
     }
@@ -65,6 +65,15 @@ enum FuelPriceProvider {
         return result
     }
 
+    static func fuelType(for grade: String) -> FuelType? {
+        switch grade.uppercased() {
+        case "E10": return .e10
+        case "E5": return .e5
+        case "DIESEL", "B7", "B7S", "B7P", "B10": return .diesel
+        default: return nil
+        }
+    }
+
     /// Decodes mirror envelope metadata (source, dataset update time) — the
     /// About section shows these so the user can see which data source is
     /// live and how fresh the GOV.UK data itself is. The fields are additive
@@ -106,6 +115,16 @@ private struct MirrorResponse: Codable {
         let lng: Double?
         let price: Double?
         let prices: [String: Double]?
+        let priceUpdated: String?
+
+        enum CodingKeys: String, CodingKey {
+            case id, name, brand, address, postcode, lat, lng, price, prices
+            case priceUpdated = "price_updated"
+        }
+
+        var priceUpdatedDate: Date? {
+            FuelPriceTimestamp.parse(priceUpdated)
+        }
 
         /// Map mirror grade keys (E5/E10/DIESEL) to FuelType for ALL fuels the
         /// station sells — one fetch populates every fuel tab. Defensive guard:

Shared/FuelPriceWidgetViews.swift

@@ -29,11 +29,12 @@ struct FuelPriceWidgetEntryData {
     let date: Date
     let stations: [FuelStation]   // already filtered + sorted per config
     let fuel: FuelType
-    let sort: SortMode            // per-widget: cheapest | closest
+    let sort: SortMode            // per-widget: cheapest | closest | Best Value
-    let isFavourites: Bool        // favourites mode: pinned stations, cheapest-first
+    let isFavourites: Bool        // favourites mode: pinned stations
     let location: Coordinate?
     let locationSource: String    // "live" | "cached" | "none"
     let unit: DistanceUnit        // user's display unit for distances
+    let bestValueResult: FuelSavingsResult? // only populated for the small Best Value face
 }
 
 /// The widget face, parameterised by family so the app can preview it.
@@ -67,9 +68,11 @@ struct FuelPriceWidgetContent: View {
 
     private var heading: String {
         if entry.isFavourites { return "Favourite \(entry.fuel.displayName)" }
-        return entry.sort == .closest
+        switch entry.sort {
-            ? "Closest \(entry.fuel.displayName)"
+        case .closest: return "Closest \(entry.fuel.displayName)"
-            : "Cheapest \(entry.fuel.displayName)"
+        case .worthTheDrive: return "Best Value \(entry.fuel.displayName)"
+        case .cheapest: return "Cheapest \(entry.fuel.displayName)"
+        }
     }
 
     private var singleStation: some View {
@@ -85,7 +88,25 @@ struct FuelPriceWidgetContent: View {
             Text(station.name)
                 .font(.headline)
                 .lineLimit(1)
-            if let price = station.prices[entry.fuel] {
+            if entry.sort == .worthTheDrive, let result = entry.bestValueResult {
+                Text(result.headline(compact: true))
+                    .font(.title3.weight(.bold))
+                    .lineLimit(1)
+                Text(result.status == .baseline ? "your baseline" : "vs closest station")
+                    .font(.caption2)
+                    .foregroundStyle(.secondary)
+                    .lineLimit(1)
+            } else if entry.sort == .worthTheDrive {
+                if let price = station.prices[entry.fuel] {
+                    FuelStore.priceTextAttributed(price, size: 26, weight: .bold, color: .green)
+                }
+                if entry.location == nil {
+                    Text("Best Value unavailable · location needed")
+                        .font(.caption2)
+                        .foregroundStyle(.orange)
+                        .lineLimit(2)
+                }
+            } else if let price = station.prices[entry.fuel] {
                 FuelStore.priceTextAttributed(price, size: 26, weight: .bold, color: .green)
             }
             if let location = entry.location {
@@ -126,7 +147,7 @@ struct FuelPriceWidgetContent: View {
                     .font(.caption2)
                     .foregroundStyle(.secondary)
                 Spacer()
-                Text(entry.isFavourites ? "cheapest first"
+                Text(entry.isFavourites ? "your order"
                      : (entry.locationSource == "none" ? "by price" : "near you"))
                     .font(.caption2)
                     .foregroundStyle(.secondary)

Shared/FuelSavings.swift

@@ -82,6 +82,7 @@ enum JourneyConfidence: String, Codable, Equatable {
 struct FuelSavingsResult: Codable, Equatable {
     let fillLitres: Double
     let grossSavingGBP: Double
+    let extraFuelLitres: Double
     let extraDrivingCostGBP: Double
     let extraDistanceMiles: Double
     let netSavingGBP: Double
@@ -91,6 +92,7 @@ struct FuelSavingsResult: Codable, Equatable {
 
     init(fillLitres: Double,
          grossSavingGBP: Double,
+         extraFuelLitres: Double = 0,
          extraDrivingCostGBP: Double,
          extraDistanceMiles: Double,
          netSavingGBP: Double,
@@ -99,6 +101,7 @@ struct FuelSavingsResult: Codable, Equatable {
          journeyConfidence: JourneyConfidence? = nil) {
         self.fillLitres = fillLitres
         self.grossSavingGBP = grossSavingGBP
+        self.extraFuelLitres = extraFuelLitres
         self.extraDrivingCostGBP = extraDrivingCostGBP
         self.extraDistanceMiles = extraDistanceMiles
         self.netSavingGBP = netSavingGBP
@@ -133,11 +136,32 @@ 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.
+    /// "Closest" refers to the existing shortest-journey baseline selection;
+    /// it does not claim a straight-line comparison.
+    static func comparisonLabel(status: FuelSavingsStatus) -> String {
+        status == .baseline ? "your baseline" : "vs closest station"
     }
 
     /// VoiceOver form of `extraTravelLabel`. The abbreviation and the unit suffix
@@ -174,6 +198,7 @@ extension FuelSavingsResult {
         FuelSavingsResult(
             fillLitres: fillLitres,
             grossSavingGBP: 0,
+            extraFuelLitres: 0,
             extraDrivingCostGBP: 0,
             extraDistanceMiles: 0,
             netSavingGBP: 0,
@@ -199,9 +224,9 @@ extension FuelSavingsResult {
         case .breakEven:
             return Self.breakEvenHeadline
         case .worthTheDrive:
-            return "\(prefix)\(FuelSavingsFormat.money(netSavingGBP)) better off after travel"
+            return "\(prefix)Save \(FuelSavingsFormat.money(netSavingGBP))"
         case .notWorthTheDrive:
-            return "\(prefix)\(FuelSavingsFormat.money(abs(netSavingGBP))) worse off after travel"
+            return "\(prefix)Costs \(FuelSavingsFormat.money(abs(netSavingGBP))) more"
         }
     }
 
@@ -211,13 +236,11 @@ extension FuelSavingsResult {
         headline().replacingOccurrences(of: "Approx. ", with: "Approximately ")
     }
 
-    /// Row capsule copy: the headline, plus what the baseline row IS. Without the
+    /// Row capsule copy. The baseline relationship is shown as secondary text
-    /// suffix the baseline capsule just repeated the status word above it
+    /// beside the capsule in the station listing and detail summary, so the
-    /// ("Closest station" twice) and said nothing about the saving being measured
+    /// capsule itself contains only the verdict.
-    /// against it.
     func capsuleHeadline() -> String {
-        let headline = headline(compact: true)
+        headline(compact: true)
-        return status == .baseline ? "\(headline) · your baseline" : headline
     }
 }
 
@@ -253,6 +276,29 @@ struct FuelSavingsRankedStation: Equatable {
     let pricePencePerLitre: Double
 }
 
+/// Which recommendation badge a station listing row shows, if any.
+///
+/// Presentation only — no new rules: the BEST VALUE qualification reuses the
+/// app's existing Best Value gate (the user's alert threshold, the same figure
+/// `FuelSavingsCalculator.bestValueAlertCandidate` is given) and CHEAPEST
+/// reuses the caller's existing "cheapest in range" flag (the station behind
+/// `topStationID`). One badge per row: a station that is both the cheapest and
+/// worth the drive shows BEST VALUE, the stronger of the two.
+enum StationRecommendationBadge: Equatable {
+    case bestValue
+    case cheapest
+
+    static func badge(netSavingGBP: Double?,
+                      isCheapest: Bool,
+                      bestValueThresholdGBP: Double) -> StationRecommendationBadge? {
+        if let netSavingGBP, netSavingGBP.isFinite, bestValueThresholdGBP.isFinite,
+           netSavingGBP >= bestValueThresholdGBP {
+            return .bestValue
+        }
+        return isCheapest ? .cheapest : nil
+    }
+}
+
 struct BestValueAlertCandidate: Equatable {
     let station: FuelStation
     let result: FuelSavingsResult
@@ -321,16 +367,29 @@ enum FuelSavingsCalculator {
         distanceMiles / mpg * imperialGallonLitres
     }
 
-    static func fillLitres(amount: FuelSavingsFillAmount, baselinePricePencePerLitre: Double) throws -> Double {
+    static func fillLitres(amount: FuelSavingsFillAmount, pricePencePerLitre: Double) throws -> Double {
         guard amount.isValid else { throw FuelSavingsError.invalidAmount }
         switch amount.unit {
         case .litres:
             return amount.value
         case .pounds:
-            guard baselinePricePencePerLitre.isFinite, baselinePricePencePerLitre > 0 else {
+            guard pricePencePerLitre.isFinite, pricePencePerLitre > 0 else {
                 throw FuelSavingsError.invalidPrice
             }
-            return amount.value / (baselinePricePencePerLitre / 100.0)
+            return amount.value / (pricePencePerLitre / 100.0)
+        }
+    }
+
+    /// Changing between a per-candidate monetary budget and a fixed litre
+    /// quantity has no lossless conversion across all stations. Start a new
+    /// comparison at that mode's stated default; the UI must tell the user
+    /// explicitly that the comparison basis changed and invite adjustment.
+    static func newComparisonAmount(afterSwitching amount: FuelSavingsFillAmount,
+                                    to unit: FuelSavingsFillUnit) -> FuelSavingsFillAmount {
+        guard amount.unit != unit else { return amount }
+        switch unit {
+        case .pounds: return FuelSavingsFillAmount(value: 40, unit: .pounds)
+        case .litres: return FuelSavingsFillAmount(value: 30, unit: .litres)
         }
     }
 
@@ -376,7 +435,7 @@ enum FuelSavingsCalculator {
               baselineJourneyMiles >= 0, candidateJourneyMiles >= 0 else {
             throw FuelSavingsError.invalidDistance
         }
-        let fillLitres = try fillLitres(amount: amount, baselinePricePencePerLitre: baselinePricePencePerLitre)
+        let fillLitres = try fillLitres(amount: amount, pricePencePerLitre: candidatePricePencePerLitre)
         let baselinePriceGBP = baselinePricePencePerLitre / 100.0
         let candidatePriceGBP = candidatePricePencePerLitre / 100.0
         let grossSaving = fillLitres * (baselinePriceGBP - candidatePriceGBP)
@@ -395,6 +454,7 @@ enum FuelSavingsCalculator {
         return FuelSavingsResult(
             fillLitres: fillLitres,
             grossSavingGBP: grossSaving,
+            extraFuelLitres: extraFuelLitres,
             extraDrivingCostGBP: extraFuelCost,
             extraDistanceMiles: extraDistance,
             netSavingGBP: netSaving,
@@ -572,7 +632,11 @@ enum FuelSavingsEstimator {
                 journeys[station.id] = journey
             }
         }
-        let baselineJourney = baseline.flatMap { journeys[$0.id] }
+        // The baseline is normally in the pool, so this is the same lookup it has
+        // always been; asking for its journey directly covers the case where the
+        // list being ranked is filtered tighter than the baseline was chosen from,
+        // which would otherwise mark every row unavailable.
+        let baselineJourney = baseline.flatMap { journeys[$0.id] ?? journeyMiles($0) }
         let ranked = stations.map { station -> FuelSavingsRankedStation in
             let journey = journeys[station.id]
             let availability = availability(station: station,

Shared/FuelStore.swift

@@ -183,13 +183,13 @@ enum DistanceUnit: String, Codable, CaseIterable, Identifiable {
     /// shown in this unit, rounded to a whole number for picker labels:
     /// 5 miles -> "5" (miles unit) or "8" (km unit).
     func displayMiles(_ miles: Int) -> Int {
-        Int(fromKM(Double(miles) * 1.60934).rounded())
+        Int(fromKM(Double(miles) * FuelSavingsCalculator.kilometresPerMile).rounded())
     }
 
     /// Convert a value expressed in this unit to km.
     func toKM(_ value: Double) -> Double {
         switch self {
-        case .miles: return value * 1.60934
+        case .miles: return value * FuelSavingsCalculator.kilometresPerMile
         case .kilometers: return value
         }
     }
@@ -197,7 +197,7 @@ enum DistanceUnit: String, Codable, CaseIterable, Identifiable {
     /// Convert a km value to this unit.
     func fromKM(_ km: Double) -> Double {
         switch self {
-        case .miles: return km * 0.621371
+        case .miles: return km / FuelSavingsCalculator.kilometresPerMile
         case .kilometers: return km
         }
     }
@@ -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"
         }
     }
 }
@@ -273,8 +273,56 @@ struct FuelStation: Identifiable, Codable, Equatable {
     let lng: Double
     /// Price per fuel type in pence per litre. Missing type = station doesn't sell it.
     let prices: [FuelType: Double]
-    /// Updated timestamp (seconds since 1970) — nil for sample data.
+    /// Station-level price timestamp (seconds since 1970): the relay's
+    /// `price_updated`, i.e. the newest price submission across the grades it
+    /// maps — never a per-grade time. nil when the source omits it (sample data).
     let priceUpdated: TimeInterval?
+    init(id: String, name: String, brand: String, address: String, postcode: String,
+         lat: Double, lng: Double, prices: [FuelType: Double],
+         priceUpdated: TimeInterval?) {
+        self.id = id
+        self.name = name
+        self.brand = brand
+        self.address = address
+        self.postcode = postcode
+        self.lat = lat
+        self.lng = lng
+        self.prices = prices
+        self.priceUpdated = priceUpdated
+    }
+
+    private enum CodingKeys: String, CodingKey {
+        case id, name, brand, address, postcode, lat, lng, prices
+        case priceUpdated = "priceUpdated"
+        case priceUpdatedSnake = "price_updated"
+    }
+
+    init(from decoder: Decoder) throws {
+        let values = try decoder.container(keyedBy: CodingKeys.self)
+        id = try values.decode(String.self, forKey: .id)
+        name = try values.decode(String.self, forKey: .name)
+        brand = try values.decode(String.self, forKey: .brand)
+        address = try values.decode(String.self, forKey: .address)
+        postcode = try values.decode(String.self, forKey: .postcode)
+        lat = try values.decode(Double.self, forKey: .lat)
+        lng = try values.decode(Double.self, forKey: .lng)
+        prices = try values.decode([FuelType: Double].self, forKey: .prices)
+        priceUpdated = try values.decodeIfPresent(TimeInterval.self, forKey: .priceUpdated)
+            ?? values.decodeIfPresent(TimeInterval.self, forKey: .priceUpdatedSnake)
+    }
+
+    func encode(to encoder: Encoder) throws {
+        var values = encoder.container(keyedBy: CodingKeys.self)
+        try values.encode(id, forKey: .id)
+        try values.encode(name, forKey: .name)
+        try values.encode(brand, forKey: .brand)
+        try values.encode(address, forKey: .address)
+        try values.encode(postcode, forKey: .postcode)
+        try values.encode(lat, forKey: .lat)
+        try values.encode(lng, forKey: .lng)
+        try values.encode(prices, forKey: .prices)
+        try values.encodeIfPresent(priceUpdated, forKey: .priceUpdated)
+    }
 
     /// Cheap haversine distance to a location, in km.
     func distanceKM(to lat2: Double, lng2: Double) -> Double {
@@ -663,7 +711,16 @@ struct FuelStore {
         saveString(mode.rawValue, service: alertsModeKey)
     }
 
-    static let bestValueAlertThresholdOptionsGBP: [Double] = [0.5, 1.0, 2.0, 5.0]
+    /// The Best Value gate's options, in 50p steps from 50p to £5. The gate is
+    /// the same figure for the listing's BEST VALUE badges and for the alert, so
+    /// its granularity decides how finely the two can be tuned: the old four
+    /// values (50p, £1, £2, £5) made £2.50 and £3 unreachable, and a whole extra
+    /// detour's worth of saving sat between £1 and £2. Multiples of 0.5 are
+    /// exactly representable, so the stored value and the picker's tags cannot
+    /// drift apart.
+    static let bestValueAlertThresholdOptionsGBP: [Double] = [
+        0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0
+    ]
 
     static func loadAlertsBestValueThresholdGBP() -> Double {
         if let raw = loadString(service: alertsBestValueThresholdKey),
@@ -793,6 +850,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] = ["⁰", "¹", "²", "³", "⁴", "⁵", "⁶", "⁷", "⁸", "⁹"]
@@ -979,7 +1056,7 @@ struct FuelStore {
 
     /// "Follow search" caps the geofence at 8 miles so a 10/15-mile Stations
     /// search never creates huge region-monitoring circles.
-    static let alertFollowCapKM: Double = 8 * 1.60934
+    static let alertFollowCapKM: Double = 8 * FuelSavingsCalculator.kilometresPerMile
 
     /// The effective alert radius: the manual radius, or — when alerts follow
     /// the Stations-tab search — that distance (miles, converted via the
@@ -1618,10 +1695,22 @@ struct FuelStore {
         // what the rows show.
         if accurateDistancesEnabled,
            accurateDistancesReady(userLat: userLat, userLng: userLng),
-           let meters = roadDistanceMeters(for: station, userLat: userLat, userLng: userLng) {
+           let entry = roadDistanceEntry(for: station, userLat: userLat, userLng: userLng) {
-            return StationDistanceDisplay(km: meters / 1000.0, isApproximate: false)
+            let returnKM = (entry.meters + (entry.returnMeters ?? entry.meters)) / 1000.0
+            return StationDistanceDisplay(
+                km: entry.meters / 1000.0,
+                isApproximate: false,
+                returnKM: returnKM,
+                returnIsApproximate: entry.returnMeters == nil
+            )
         }
-        return StationDistanceDisplay(km: station.distanceKM(to: userLat, lng2: userLng), isApproximate: true)
+        let km = station.distanceKM(to: userLat, lng2: userLng)
+        return StationDistanceDisplay(
+            km: km,
+            isApproximate: true,
+            returnKM: km * 2,
+            returnIsApproximate: true
+        )
     }
 
     /// Radius test on the SAME distance the UI shows. Filtering straight-line
@@ -1650,11 +1739,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,
@@ -1710,35 +1806,65 @@ struct RoadDistanceDiagnostics: Equatable {
 /// road distance or the straight-line fallback. The confidence travels WITH the
 /// value, so a label can never claim a confidence the figure doesn't have.
 struct StationDistanceDisplay: Equatable {
-    let km: Double
+let km: Double
-    let isApproximate: Bool
+let isApproximate: Bool
+let returnKM: Double
+let returnIsApproximate: Bool
 
-    /// Row/sheet label: a straight-line fallback is marked "Approx." so a figure
+init(km: Double,
-    /// that is NOT a routed road distance can never be read as one, and a cached
+     isApproximate: Bool,
-    /// road distance stays a bare figure. It updates by itself once routing lands,
+     returnKM: Double? = nil,
-    /// because `FuelStore.stationDistanceDisplay` re-reads the cache every call.
+     returnIsApproximate: Bool? = nil) {
-    func label(unit: DistanceUnit) -> String {
+    self.km = km
-        let text = unit.format(km)
+    self.isApproximate = isApproximate
-        return isApproximate ? "Approx. \(text)" : text
+    self.returnKM = returnKM ?? km * 2
-    }
+    self.returnIsApproximate = returnIsApproximate ?? isApproximate
+}
 
-    /// Row/sheet label that keeps the one-way station distance primary, then
+/// Row/sheet label: a straight-line fallback is marked "Approx." so a figure
-    /// adds the out-and-back distance in brackets. This matches Best Value's
+/// that is NOT a routed road distance can never be read as one, and a cached
-    /// "extra return travel" basis without changing the actual distance model.
+/// road distance stays a bare figure. It updates by itself once routing lands,
-    func labelWithReturn(unit: DistanceUnit) -> String {
+/// because `FuelStore.stationDistanceDisplay` re-reads the cache every call.
-        "\(label(unit: unit)) (\(unit.format(km * 2)) return)"
+func label(unit: DistanceUnit) -> String {
-    }
+    let text = unit.format(km)
+    return isApproximate ? "Approx. \(text)" : text
+}
 
-    /// VoiceOver form of `label(unit:)`.
+/// Row/sheet label that keeps the one-way station distance primary, then
-    func spokenLabel(unit: DistanceUnit) -> String {
+/// adds the independently measured or estimated out-and-back distance.
-        let text = unit.spoken(km)
+func labelWithReturn(unit: DistanceUnit) -> String {
-        return isApproximate ? "Approximately \(text)" : text
+    "\(label(unit: unit)) (\(returnLabel(unit: unit)))"
-    }
+}
 
-    /// VoiceOver form of `labelWithReturn(unit:)`.
+/// The out-and-back figure on its own: "5.0 mi return" / "Approx. 5.0 mi return".
-    func spokenLabelWithReturn(unit: DistanceUnit) -> String {
+///
-        "\(spokenLabel(unit: unit)), \(unit.spoken(km * 2)) 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:)`.
+func spokenLabel(unit: DistanceUnit) -> String {
+    let text = unit.spoken(km)
+    return isApproximate ? "Approximately \(text)" : text
+}
+
+/// VoiceOver form of `labelWithReturn(unit:)`.
+func spokenLabelWithReturn(unit: DistanceUnit) -> String {
+    let returnText = unit.spoken(returnKM)
+    let returnLabel = returnIsApproximate ? "Approximately \(returnText)" : returnText
+    return "\(spokenLabel(unit: unit)), \(returnLabel) return"
+}
 }
 
 /// Cached Apple-Maps road distances for nearby stations (see

Shared/SiriCheapestLookup.swift

@@ -21,7 +21,7 @@ enum SiriCheapestLookup {
         lng: Double,
         withinMiles: Double
     ) -> FuelStation? {
-        let radiusKM = withinMiles * 1.60934
+        let radiusKM = withinMiles * FuelSavingsCalculator.kilometresPerMile
         // Same radius rule as the app list: the distance the answer would SHOW
         // (cached road route where there is one).
         return stations