fixes before build

lib/home_screen.dart

@@ -63,10 +63,11 @@ class _HomeScreenState extends State<HomeScreen> {
     try {
       final overview = await widget.repository.getOverview();
       final stores = await widget.repository.getSupermarkets();
+      final lastTripStores = await widget.repository.getLastTripSupermarkets();
       if (!mounted || token != _loadToken) return;
       setState(() {
         _overview = overview;
-        _stores = stores;
+        _stores = sortStoresByLastTrip(stores, lastTripStores);
         _error = null;
       });
     } catch (error) {
@@ -281,6 +282,9 @@ class _HomeBody extends StatelessWidget {
           SizedBox(
             height: 148,
             child: ListView.separated(
+              key: ValueKey(
+                stores.isEmpty ? 'bonus-empty' : 'bonus-${stores.first.name}',
+              ),
               scrollDirection: Axis.horizontal,
               itemCount: stores.length,
               separatorBuilder: (_, _) => const SizedBox(width: 12),

lib/models/product.dart

@@ -72,4 +72,4 @@ class Product {
   }
 }
 
-enum ProductSort { name, preferred, start }
+enum ProductSort { name, preferred, favourite }

lib/models/supermarket.dart

@@ -50,6 +50,32 @@ class Supermarket {
   }
 }
 
+/// Puts stores with the most recent trip first, then earlier trips, then unused.
+List<Supermarket> sortStoresByLastTrip(
+  List<Supermarket> stores,
+  Iterable<String> lastTripStores,
+) {
+  final rank = <String, int>{};
+  var next = 0;
+  for (final name in lastTripStores) {
+    final key = name.trim().toUpperCase();
+    if (key.isEmpty || rank.containsKey(key)) continue;
+    rank[key] = next++;
+  }
+
+  final sorted = [...stores];
+  sorted.sort((a, b) {
+    final aRank = rank[a.name.trim().toUpperCase()] ?? 1 << 20;
+    final bRank = rank[b.name.trim().toUpperCase()] ?? 1 << 20;
+    final byTrip = aRank.compareTo(bRank);
+    if (byTrip != 0) return byTrip;
+    final byOrder = a.sortOrder.compareTo(b.sortOrder);
+    if (byOrder != 0) return byOrder;
+    return a.name.toLowerCase().compareTo(b.name.toLowerCase());
+  });
+  return sorted;
+}
+
 /// Palette offered when the user picks a store color.
 const List<int> kStoreColorPalette = [
   0xFFEEC21B, // Jumbo yellow

lib/products_screen.dart

@@ -180,10 +180,16 @@ class _ProductsScreenState extends State<ProductsScreen> {
         for (final item in _products ?? const <Product>[])
           if (item.id == product.id) item.copyWith(favourite: next) else item,
       ];
+      if (_sort == ProductSort.favourite && !next) {
+        _products = [
+          for (final item in _products!)
+            if (item.id != product.id) item,
+        ];
+        if (_products!.isEmpty) _editing = false;
+      }
     });
     try {
       await widget.repository.setFavourite(product.id, next);
-      if (_sort == ProductSort.start && mounted) _load();
     } catch (_) {
       if (mounted) _load();
     }
@@ -265,11 +271,12 @@ class _ProductsScreenState extends State<ProductsScreen> {
                 ),
                 ButtonSegment(
                   value: ProductSort.preferred,
-                  label: Text('Preferred'),
+                  label: Text('Frequent'),
                 ),
                 ButtonSegment(
-                  value: ProductSort.start,
-                  label: Text('Start'),
+                  value: ProductSort.favourite,
+                  icon: Icon(Icons.star),
+                  label: Text('Star'),
                 ),
               ],
               selected: {_sort},
@@ -311,7 +318,9 @@ class _ProductsScreenState extends State<ProductsScreen> {
     if (_products!.isEmpty) {
       return Center(
         child: Text(
-          'Confirmed receipt items will show up here.',
+          _sort == ProductSort.favourite
+              ? 'Star products to keep them as favourites.'
+              : 'Confirmed receipt items will show up here.',
           textAlign: TextAlign.center,
           style: theme.textTheme.bodyLarge,
         ),

lib/services/product_repository.dart

@@ -392,10 +392,11 @@ class ProductRepository extends ChangeNotifier {
     ProductSort sort = ProductSort.name,
   }) async {
     final db = await _database;
+    final favouritesOnly = sort == ProductSort.favourite;
     final orderBy = switch (sort) {
       ProductSort.name => 'name COLLATE NOCASE ASC',
       ProductSort.preferred => 'times_seen DESC, name COLLATE NOCASE ASC',
-      ProductSort.start => 'favourite DESC, name COLLATE NOCASE ASC',
+      ProductSort.favourite => 'name COLLATE NOCASE ASC',
     };
     final rows = await db.rawQuery('''
       SELECT
@@ -409,6 +410,7 @@ class ProductRepository extends ChangeNotifier {
           LIMIT 1
         ) AS display_price
       FROM products
+      ${favouritesOnly ? 'WHERE favourite = 1' : ''}
       ORDER BY $orderBy
     ''');
     return rows.map(Product.fromMap).toList();
@@ -1436,6 +1438,21 @@ class ProductRepository extends ChangeNotifier {
     return rows.map(Supermarket.fromMap).toList();
   }
 
+  /// Store names from newest trip to oldest, unique.
+  Future<List<String>> getLastTripSupermarkets() async {
+    final db = await _database;
+    final rows = await db.rawQuery('''
+      SELECT supermarket
+      FROM shops
+      GROUP BY supermarket
+      ORDER BY MAX(shopped_at) DESC, MAX(id) DESC
+    ''');
+    return [
+      for (final row in rows)
+        if (row['supermarket'] is String) row['supermarket']! as String,
+    ];
+  }
+
   Future<Supermarket> addSupermarket({
     required String name,
     required int colorValue,