From 7357eb98c34f4e719a6e9f483a1f9f785d3901ba Mon Sep 17 00:00:00 2001
From: FuelBoard Contributor <fuelboard@localhost>
Date: Thu, 13 Aug 2026 16:51:21 +0100
Subject: [PATCH] Small widget favourites: fuel row returns to the config sheet
 (picks the default favourite); pinned favourite wins, fuel-tagged picker rows
 when favourites span >1 fuel; fallback = selected fuel's cheapest favourite

---
 FuelBoardWidgets/FuelPriceWidget.swift    | 37 +++++++++++++++--------
 FuelBoardWidgets/WidgetConfigIntent.swift | 20 ++++++------
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/FuelBoardWidgets/FuelPriceWidget.swift b/FuelBoardWidgets/FuelPriceWidget.swift
index 7501eb7..b471c9f 100644
--- a/FuelBoardWidgets/FuelPriceWidget.swift
+++ b/FuelBoardWidgets/FuelPriceWidget.swift
@@ -162,20 +162,31 @@ struct FuelPriceTimelineProvider<Configuration: WidgetConfigurationIntent & Widg
                 .filter { $0.station.prices[$0.fuel] != nil }
 
             // Small widget, pinned favourite: exactly ONE station, its own
-            // fuel, no radius. Freshen its price when a focused fetch covers it.
-            if let chosen = configuration.favouriteChoice,
-               let entry = favourites.first(where: { $0.id == chosen.id }) {
-                var station = entry.station
-                if let location,
-                   let fetched = await Self.fetchFocused(near: location, fuel: entry.fuel, radiusKM: radiusKM),
-                   let fresh = fetched.first(where: { $0.id == entry.station.id }) {
-                    station = fresh
+            // fuel, no radius. Freshen its price when a focused fetch covers
+            // it. The chosen favourite wins; when it's missing or stale (fresh
+            // widget, favourite removed, fuel row changed) fall back to the
+            // Fuel row's cheapest favourite so the face is never blank.
+            if let chosen = configuration.favouriteChoice {
+                let pinned = favourites.first { $0.id == chosen.id }
+                    ?? favourites
+                        .filter { $0.fuel == fuel && $0.station.prices[fuel] != nil }
+                        .min { lhs, rhs in
+                            (lhs.station.prices[fuel] ?? .infinity) <
+                            (rhs.station.prices[fuel] ?? .infinity)
+                        }
+                if let pinned {
+                    var station = pinned.station
+                    if let location,
+                       let fetched = await Self.fetchFocused(near: location, fuel: pinned.fuel, radiusKM: radiusKM),
+                       let fresh = fetched.first(where: { $0.id == pinned.station.id }) {
+                        station = fresh
+                    }
+                    return FuelPriceEntry(
+                        date: Date(), stations: [station],
+                        fuel: pinned.fuel, sort: .cheapest, isFavourites: true,
+                        location: location, locationSource: source, unit: unit
+                    )
                 }
-                return FuelPriceEntry(
-                    date: Date(), stations: [station],
-                    fuel: entry.fuel, sort: .cheapest, isFavourites: true,
-                    location: location, locationSource: source, unit: unit
-                )
             }
 
             // List mode (medium): pinned stations for THIS fuel, cheapest-first.
diff --git a/FuelBoardWidgets/WidgetConfigIntent.swift b/FuelBoardWidgets/WidgetConfigIntent.swift
index 73b21e6..4d55e58 100644
--- a/FuelBoardWidgets/WidgetConfigIntent.swift
+++ b/FuelBoardWidgets/WidgetConfigIntent.swift
@@ -84,12 +84,12 @@ struct WidgetFavourite: AppEntity, Identifiable, Hashable, Codable {
             return DisplayRepresentation(stringLiteral: "Favourite")
         }
         let name = entry.station.name
-        // Same station pinned for another fuel? Disambiguate with the fuel tag.
-        let hasOtherFuel = favourites.contains {
-            $0.station.id == entry.station.id && $0.fuel != entry.fuel
-        }
+        // If favourites span more than one fuel type, tag EVERY option with its
+        // fuel so the picker stays unambiguous (different stations can share a
+        // name; the same station can be pinned for two fuels).
+        let multiFuel = Set(favourites.map(\.fuel)).count > 1
         return DisplayRepresentation(
-            stringLiteral: hasOtherFuel ? "\(name) · \(entry.fuel.displayName)" : name
+            stringLiteral: multiFuel ? "\\(name) · \\(entry.fuel.displayName)" : name
         )
     }
 
@@ -167,9 +167,10 @@ struct FuelBoardWidgetConfigurationIntent: WidgetConfigurationIntent, WidgetConf
 
 // SMALL widget intent: same knobs as the list widget, PLUS a pinned-favourite
 // picker for Favourites sort (a small widget shows exactly ONE station, so the
-// user chooses which favourite). In Favourites mode the Fuel + Distance rows
-// are hidden — the chosen favourite carries its own fuel, and there is no
-// radius when a station is pinned.
+// user chooses which favourite). Favourites mode keeps the Fuel row — it
+// mirrors the app's Favourites tab: pick the fuel, then the favourite. The
+// pinned favourite wins when set; the Fuel row picks the default favourite on
+// a fresh widget. Distance stays hidden (a pinned station has no radius).
 struct FuelBoardSmallWidgetConfigurationIntent: WidgetConfigurationIntent, WidgetConfigValues {
     static var title: LocalizedStringResource = "Fuel & Sort"
     static var description = IntentDescription("Which fuel, ordering, radius and pinned favourite this small widget shows.")
@@ -190,8 +191,9 @@ struct FuelBoardSmallWidgetConfigurationIntent: WidgetConfigurationIntent, Widge
 
     static var parameterSummary: some ParameterSummary {
         When(\.$sort, .equalTo, WidgetSort.favourites) {
-            Summary("Show \(\.$favourite)") {
+            Summary("Show \(\.$fuel) favourite \(\.$favourite)") {
                 \.$sort
+                \.$fuel
                 \.$favourite
             }
         } otherwise: {