add refresh button to pending page

README.md

@@ -41,6 +41,12 @@ Mileograph is a Flutter client for logging and analysing railway journeys. It le
   ```bash
   flutter build apk --release
   ```
+- Web (release + CanvasKit renderer for best performance/icons):  
+  ```bash
+  flutter build web --release --web-renderer canvaskit --tree-shake-icons
+  # or for local profiling:
+  flutter run -d chrome --profile --web-renderer canvaskit
+  ```
 
 ## Testing and linting
 - Static analysis: `flutter analyze`

lib/app.dart

@@ -2,8 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/services/api_service.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/accent_color_service.dart';
 import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:mileograph_flutter/services/endpoint_service.dart';
+import 'package:mileograph_flutter/services/theme_mode_service.dart';
 import 'package:mileograph_flutter/ui/app_shell.dart';
 import 'package:provider/provider.dart';
 
@@ -17,9 +19,15 @@ class App extends StatelessWidget {
         ChangeNotifierProvider<EndpointService>(
           create: (_) => EndpointService(),
         ),
+        ChangeNotifierProvider<AccentColorService>(
+          create: (_) => AccentColorService(),
+        ),
         ChangeNotifierProvider<DistanceUnitService>(
           create: (_) => DistanceUnitService(),
         ),
+        ChangeNotifierProvider<ThemeModeService>(
+          create: (_) => ThemeModeService(),
+        ),
         ProxyProvider<EndpointService, ApiService>(
           update: (_, endpoint, api) {
             final service = api ?? ApiService(baseUrl: endpoint.baseUrl);

lib/components/calculator/calculator.dart

@@ -133,6 +133,7 @@ class _RouteCalculatorState extends State<RouteCalculator> {
   bool _loadingStations = false;
 
   RouteResult? _routeResult;
+  List<String>? _calculatedStations;
   RouteResult? get result => _routeResult;
   String? _errorMessage;
 
@@ -178,6 +179,7 @@ class _RouteCalculatorState extends State<RouteCalculator> {
     if (cleaned.length < 2) {
       setState(() {
         _routeResult = null;
+        _calculatedStations = null;
         _errorMessage = 'Add at least two stations before calculating.';
       });
       return;
@@ -185,6 +187,7 @@ class _RouteCalculatorState extends State<RouteCalculator> {
     setState(() {
       _errorMessage = null;
       _routeResult = null;
+      _calculatedStations = null;
     });
     final api = context.read<ApiService>(); // context is valid here
     try {
@@ -195,6 +198,7 @@ class _RouteCalculatorState extends State<RouteCalculator> {
       if (res is Map && res['error'] == false) {
         setState(() {
           _routeResult = RouteResult.fromJson(Map<String, dynamic>.from(res));
+          _calculatedStations = List.from(cleaned);
         });
         final distance = (_routeResult?.distance ?? 0);
         widget.onDistanceComputed?.call(distance);
@@ -205,17 +209,30 @@ class _RouteCalculatorState extends State<RouteCalculator> {
           ).msg;
         });
       } else {
-        setState(() => _errorMessage = 'Failed to calculate route.');
+        setState(() {
+          _errorMessage = 'Failed to calculate route.';
+          _calculatedStations = null;
+        });
       }
     } catch (e) {
-      setState(() => _errorMessage = 'Failed to calculate route: $e');
+      setState(() {
+        _errorMessage = 'Failed to calculate route: $e';
+        _calculatedStations = null;
+      });
     }
   }
 
+  void _markRouteDirty() {
+    _routeResult = null;
+    _calculatedStations = null;
+    _errorMessage = null;
+  }
+
   void _addStation() {
     final data = context.read<DataService>();
     setState(() {
       data.stations.add('');
+      _markRouteDirty();
     });
   }
 
@@ -223,6 +240,7 @@ class _RouteCalculatorState extends State<RouteCalculator> {
     final data = context.read<DataService>();
     setState(() {
       data.stations.removeAt(index);
+      _markRouteDirty();
     });
   }
 
@@ -230,6 +248,7 @@ class _RouteCalculatorState extends State<RouteCalculator> {
     final data = context.read<DataService>();
     setState(() {
       data.stations[index] = value;
+      _markRouteDirty();
     });
   }
 
@@ -237,14 +256,91 @@ class _RouteCalculatorState extends State<RouteCalculator> {
     final data = context.read<DataService>();
     setState(() {
       data.stations = [''];
-      _routeResult = null;
+      _markRouteDirty();
-      _errorMessage = null;
     });
   }
 
+  bool _isResultCurrent(List<String> stations) {
+    if (_routeResult == null || _calculatedStations == null) return false;
+    final cleaned = stations.where((s) => s.trim().isNotEmpty).toList();
+    if (cleaned.length != _calculatedStations!.length) return false;
+    for (var i = 0; i < cleaned.length; i++) {
+      if (cleaned[i] != _calculatedStations![i]) return false;
+    }
+    return true;
+  }
+
   @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
+    final isCompact = MediaQuery.of(context).size.width < 600;
+    final showApply =
+        widget.onApplyRoute != null && _isResultCurrent(data.stations);
+    final primaryPadding = EdgeInsets.symmetric(
+      horizontal: isCompact ? 14 : 20,
+      vertical: isCompact ? 10 : 14,
+    );
+    final secondaryPadding = EdgeInsets.symmetric(
+      horizontal: isCompact ? 10 : 16,
+      vertical: isCompact ? 8 : 12,
+    );
+    final primaryStyle = FilledButton.styleFrom(
+      padding: primaryPadding,
+      minimumSize: Size(0, isCompact ? 38 : 46),
+    );
+    final secondaryStyle = OutlinedButton.styleFrom(
+      padding: secondaryPadding,
+      minimumSize: Size(0, isCompact ? 34 : 42),
+    );
+
+    Widget buildSecondaryButton({
+      required IconData icon,
+      required String label,
+      required VoidCallback onPressed,
+    }) {
+      if (isCompact) {
+        return Tooltip(
+          message: label,
+          child: OutlinedButton(
+            onPressed: onPressed,
+            style: secondaryStyle,
+            child: Icon(icon, size: 20),
+          ),
+        );
+      }
+      return OutlinedButton.icon(
+        onPressed: onPressed,
+        icon: Icon(icon, size: 20),
+        label: Text(label),
+        style: secondaryStyle,
+      );
+    }
+
+    Widget buildPrimaryAction({required bool fullWidth}) {
+      final button = showApply
+          ? FilledButton.icon(
+              onPressed: () => widget.onApplyRoute!(_routeResult!),
+              icon: const Icon(Icons.check),
+              label: const Text('Apply to entry'),
+              style: primaryStyle,
+            )
+          : FilledButton.icon(
+              onPressed: () async {
+                await _calculateRoute(data.stations);
+              },
+              icon: const Icon(Icons.route),
+              label: const Text('Calculate Route'),
+              style: primaryStyle,
+            );
+      final key =
+          ValueKey<String>(showApply ? 'apply-primary-action' : 'calc-primary-action');
+      if (!fullWidth) return KeyedSubtree(key: key, child: button);
+      return KeyedSubtree(
+        key: key,
+        child: SizedBox(width: double.infinity, child: button),
+      );
+    }
+
     return Column(
       children: [
         Align(
@@ -301,6 +397,7 @@ class _RouteCalculatorState extends State<RouteCalculator> {
               setState(() {
                 final moved = data.stations.removeAt(oldIndex);
                 data.stations.insert(newIndex, moved);
+                _markRouteDirty();
               });
             },
             children: List.generate(data.stations.length, (index) {
@@ -364,54 +461,92 @@ class _RouteCalculatorState extends State<RouteCalculator> {
               context.push('/calculator/details', extra: result);
             },
           ),
-          if (widget.onApplyRoute != null)
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16.0),
-              child: ElevatedButton.icon(
-                onPressed: () => widget.onApplyRoute!(_routeResult!),
-                icon: const Icon(Icons.check),
-                label: const Text('Apply to entry'),
-              ),
-            ),
         ]
         else
           SizedBox.shrink(),
         const SizedBox(height: 10),
         Padding(
           padding: const EdgeInsets.symmetric(horizontal: 16.0),
-          child: Wrap(
+          child: isCompact
-            alignment: WrapAlignment.center,
+              ? Column(
-            spacing: 12,
-            runSpacing: 8,
                   children: [
-              ...(() {
+                    Row(
-                final reverseButton = ElevatedButton.icon(
+                      mainAxisAlignment: MainAxisAlignment.center,
-                  icon: const Icon(Icons.swap_horiz),
+                      children: [
-                  label: const Text('Reverse route'),
+                        buildSecondaryButton(
+                          icon: Icons.swap_horiz,
+                          label: 'Reverse route',
                           onPressed: () async {
                             setState(() {
                               data.stations = data.stations.reversed.toList();
                             });
                             await _calculateRoute(data.stations);
                           },
-                );
+                        ),
-                final addButton = ElevatedButton.icon(
+                        const SizedBox(width: 12),
-                  icon: const Icon(Icons.add),
+                        buildSecondaryButton(
-                  label: const Text('Add Station'),
+                          icon: Icons.add,
+                          label: 'Add station',
                           onPressed: _addStation,
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 10),
+                    SizedBox(
+                      width: double.infinity,
+                      child: AnimatedSwitcher(
+                        duration: const Duration(milliseconds: 220),
+                        transitionBuilder: (child, animation) {
+                          final curved = CurvedAnimation(
+                            parent: animation,
+                            curve: Curves.easeOutBack,
                           );
-                final calculateButton = ElevatedButton.icon(
+                          return ScaleTransition(
-                  icon: const Icon(Icons.route),
+                            scale:
-                  label: const Text('Calculate Route'),
+                                Tween<double>(begin: 0.94, end: 1.0).animate(curved),
+                            child: FadeTransition(opacity: animation, child: child),
+                          );
+                        },
+                      child: buildPrimaryAction(fullWidth: true),
+                    ),
+                  ),
+                ],
+                )
+              : Wrap(
+                  alignment: WrapAlignment.center,
+                  spacing: 12,
+                  runSpacing: 8,
+                  children: [
+                    buildSecondaryButton(
+                      icon: Icons.swap_horiz,
+                      label: 'Reverse route',
                       onPressed: () async {
+                        setState(() {
+                          data.stations = data.stations.reversed.toList();
+                        });
                         await _calculateRoute(data.stations);
                       },
+                    ),
+                    AnimatedSwitcher(
+                      duration: const Duration(milliseconds: 220),
+                      transitionBuilder: (child, animation) {
+                        final curved = CurvedAnimation(
+                          parent: animation,
+                          curve: Curves.easeOutBack,
                         );
-                final isMobile = MediaQuery.of(context).size.width < 600;
+                        return ScaleTransition(
-                return isMobile
+                          scale:
-                    ? [addButton, reverseButton, calculateButton]
+                              Tween<double>(begin: 0.94, end: 1.0).animate(curved),
-                    : [reverseButton, addButton, calculateButton];
+                          child: FadeTransition(opacity: animation, child: child),
-              })(),
+                        );
+                      },
+                      child: buildPrimaryAction(fullWidth: false),
+                    ),
+                    buildSecondaryButton(
+                      icon: Icons.add,
+                      label: 'Add station',
+                      onPressed: _addStation,
+                    ),
                   ],
                 ),
         ),

lib/components/pages/badges.dart

@@ -62,7 +62,7 @@ class _BadgesPageState extends State<BadgesPage> {
             if (navigator.canPop()) {
               navigator.pop();
             } else {
-              context.go('/');
+              context.go('/more');
             }
           },
         ),

lib/components/pages/loco_timeline.dart

@@ -5,8 +5,10 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:intl/intl.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:provider/provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 part 'loco_timeline/timeline_grid.dart';
 part 'loco_timeline/event_editor.dart';
@@ -16,24 +18,41 @@ class LocoTimelinePage extends StatefulWidget {
     super.key,
     required this.locoId,
     required this.locoLabel,
+    this.forceShowPending = false,
   });
 
   final int locoId;
   final String locoLabel;
+  final bool forceShowPending;
 
   @override
   State<LocoTimelinePage> createState() => _LocoTimelinePageState();
 }
 
 class _LocoTimelinePageState extends State<LocoTimelinePage> {
+  static const String _prefsKeyShowPending = 'timeline_show_pending';
+
   final List<_EventDraft> _draftEvents = [];
   bool _isSaving = false;
   bool _isDeleting = false;
+  final Set<int> _moderatingEventIds = {};
+  final Set<String> _expandedPendingAttrs = {};
+  bool _showPending = true;
 
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) => _load());
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      if (widget.forceShowPending) {
+        setState(() {
+          _showPending = true;
+        });
+      } else {
+        await _restorePendingVisibility();
+      }
+      if (!mounted) return;
+      await _load();
+    });
   }
 
   dynamic _normalizeFieldValue(_FieldEntry field) {
@@ -59,8 +78,37 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
 
   Future<void> _load() {
     final data = context.read<DataService>();
+    final auth = context.read<AuthService>();
     data.fetchEventFields();
-    return data.fetchLocoTimeline(widget.locoId);
+    return data.fetchLocoTimeline(
+      widget.locoId,
+      includeAllPending: auth.isElevated && _showPending,
+    );
+  }
+
+  Future<void> _restorePendingVisibility() async {
+    final auth = context.read<AuthService>();
+    if (!auth.isElevated) return;
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      final saved = prefs.getBool(_prefsKeyShowPending);
+      if (saved == null) return;
+      if (!mounted) return;
+      setState(() {
+        _showPending = saved;
+      });
+    } catch (_) {
+      // Ignore preference restore failures.
+    }
+  }
+
+  Future<void> _persistPendingVisibility(bool value) async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setBool(_prefsKeyShowPending, value);
+    } catch (_) {
+      // Ignore persistence failures.
+    }
   }
 
   void _addDraftEvent() {
@@ -151,8 +199,18 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
 
   Future<void> _deleteEntry(LocoAttrVersion entry) async {
     if (_isDeleting) return;
+    final isPending = entry.isPending;
     final blockId = entry.versionId;
-    if (blockId == null) {
+    final pendingEventId = entry.sourceEventId;
+    if (isPending && pendingEventId == null) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Cannot delete: pending timeline block has no event ID.'),
+        ),
+      );
+      return;
+    }
+    if (!isPending && blockId == null) {
       ScaffoldMessenger.of(context).showSnackBar(
         const SnackBar(content: Text('Cannot delete: timeline block has no ID.')),
       );
@@ -193,13 +251,23 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
       _isDeleting = true;
     });
     try {
+      if (isPending && pendingEventId != null) {
+        await data.deletePendingEvent(eventId: pendingEventId);
+      } else if (blockId != null) {
         await data.deleteTimelineBlock(
           blockId: blockId,
         );
+      }
       await _load();
       if (mounted) {
         messenger.showSnackBar(
-          const SnackBar(content: Text('Timeline block deleted')),
+          SnackBar(
+            content: Text(
+              isPending
+                  ? 'Pending timeline block deleted'
+                  : 'Timeline block deleted',
+            ),
+          ),
         );
       }
     } catch (e) {
@@ -217,6 +285,79 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
     }
   }
 
+  Future<void> _moderatePendingEntry(
+    LocoAttrVersion entry,
+    _PendingModerationAction action,
+  ) async {
+    final eventId = entry.sourceEventId;
+    if (eventId == null) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Cannot moderate: pending timeline block has no event ID.'),
+        ),
+      );
+      return;
+    }
+    if (_moderatingEventIds.contains(eventId)) return;
+    final data = context.read<DataService>();
+    final approve = action == _PendingModerationAction.approve;
+    final messenger = ScaffoldMessenger.of(context);
+    final verb = approve ? 'approve' : 'reject';
+    final ok = await showDialog<bool>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text('${approve ? 'Approve' : 'Reject'} pending event?'),
+        content: Text(
+          'Are you sure you want to $verb this pending timeline block?',
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(false),
+            child: const Text('Cancel'),
+          ),
+          FilledButton(
+            onPressed: () => Navigator.of(context).pop(true),
+            child: Text(approve ? 'Approve' : 'Reject'),
+          ),
+        ],
+      ),
+    );
+    if (ok != true || !mounted) return;
+
+    setState(() {
+      _moderatingEventIds.add(eventId);
+    });
+    try {
+      if (approve) {
+        await data.approvePendingEvent(eventId: eventId);
+      } else {
+        await data.rejectPendingEvent(eventId: eventId);
+      }
+      await _load();
+      if (mounted) {
+        messenger.showSnackBar(
+          SnackBar(
+            content: Text(
+              'Pending timeline block ${approve ? 'approved' : 'rejected'}.',
+            ),
+          ),
+        );
+      }
+    } catch (e) {
+      if (mounted) {
+        messenger.showSnackBar(
+          SnackBar(content: Text('Failed to $verb pending timeline block: $e')),
+        );
+      }
+    } finally {
+      if (mounted) {
+        setState(() {
+          _moderatingEventIds.remove(eventId);
+        });
+      }
+    }
+  }
+
   void _removeDraftAt(int index) {
     if (index < 0 || index >= _draftEvents.length) return;
     final draft = _draftEvents.removeAt(index);
@@ -248,6 +389,9 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
       _isSaving = true;
     });
     try {
+      final existingPending =
+          await data.fetchUserPendingEvents(widget.locoId);
+      final clearedEventIds = <int>{};
       final invalid = <String>[];
       for (final draft in _draftEvents) {
         final dateStr = draft.dateController.text.trim();
@@ -274,6 +418,13 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
           invalid.add('Add at least one value');
           continue;
         }
+        await _clearDuplicatePending(
+          existingPending,
+          clearedEventIds,
+          values.keys,
+          dateStr,
+          data,
+        );
         await data.createLocoEvent(
           locoId: widget.locoId,
           eventDate: dateStr,
@@ -312,6 +463,42 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
     }
   }
 
+  Future<void> _clearDuplicatePending(
+    List<LocoAttrVersion> existingPending,
+    Set<int> clearedEventIds,
+    Iterable<String> attrs,
+    String dateStr,
+    DataService data,
+  ) async {
+    final trimmedDate = dateStr.trim().toLowerCase();
+    final attrSet = attrs.map((e) => e.toLowerCase()).toSet();
+    for (final pending in existingPending) {
+      final attrMatch = attrSet.contains(pending.attrCode.toLowerCase());
+      if (!attrMatch) continue;
+      final matchesDate = _dateMatchesPending(trimmedDate, pending);
+      if (!matchesDate) continue;
+      final eventId = pending.sourceEventId;
+      if (eventId == null || clearedEventIds.contains(eventId)) continue;
+      await data.deletePendingEvent(eventId: eventId);
+      clearedEventIds.add(eventId);
+    }
+  }
+
+  bool _dateMatchesPending(String draftDateLower, LocoAttrVersion pending) {
+    final masked = pending.maskedValidFrom?.trim().toLowerCase();
+    if (masked != null && masked.isNotEmpty && masked == draftDateLower) {
+      return true;
+    }
+    final draftDate = DateTime.tryParse(draftDateLower);
+    final pendingDate = pending.validFrom;
+    if (draftDate != null && pendingDate != null) {
+      return draftDate.year == pendingDate.year &&
+          draftDate.month == pendingDate.month &&
+          draftDate.day == pendingDate.day;
+    }
+    return false;
+  }
+
   bool _isValidDateString(String input) {
     final trimmed = input.trim();
     final regex = RegExp(r'^\d{4}-(\d{2}|xx|XX)-(\d{2}|xx|XX)$');
@@ -354,7 +541,11 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
     final timeline = data.timelineForLoco(widget.locoId);
+    final isElevated = context.select<AuthService, bool>((auth) => auth.isElevated);
     final isLoading = data.isLocoTimelineLoading(widget.locoId);
+    final visibleTimeline = (!isElevated || _showPending)
+        ? timeline
+        : timeline.where((entry) => !entry.isPending).toList();
 
     return Scaffold(
       appBar: AppBar(
@@ -371,7 +562,32 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
             if (isLoading && timeline.isEmpty) {
               return const Center(child: CircularProgressIndicator());
             }
-            if (timeline.isEmpty) {
+            if (visibleTimeline.isEmpty) {
+              if (timeline.isNotEmpty && isElevated && !_showPending) {
+                return Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: Card(
+                    child: Padding(
+                      padding: const EdgeInsets.all(16.0),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            'Pending entries hidden',
+                            style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                                  fontWeight: FontWeight.w700,
+                                ),
+                          ),
+                          const SizedBox(height: 8),
+                          const Text(
+                            'Enable "Show pending entries" to view pending timeline blocks.',
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                );
+              }
               return Padding(
                 padding: const EdgeInsets.all(16.0),
                 child: Card(
@@ -405,13 +621,49 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
             return ListView(
               padding: const EdgeInsets.all(16),
               children: [
+                if (isElevated)
+                  Row(
+                    children: [
+                      Expanded(
+                        child: SwitchListTile.adaptive(
+                          contentPadding: EdgeInsets.zero,
+                          title: const Text('Show pending entries'),
+                          value: _showPending,
+                          onChanged: (value) async {
+                            setState(() {
+                              _showPending = value;
+                            });
+                            await _persistPendingVisibility(value);
+                            if (mounted) {
+                              await _load();
+                            }
+                          },
+                        ),
+                      ),
+                      IconButton(
+                        tooltip: 'Refresh timeline',
+                        onPressed: _load,
+                        icon: const Icon(Icons.refresh),
+                      ),
+                    ],
+                  ),
                 _TimelineGrid(
-                  entries: timeline,
+                  entries: visibleTimeline,
                   onEditEntry: (entry) => _prefillDraftFromEntry(
                     entry,
                     data.eventFields,
                   ),
                   onDeleteEntry: _deleteEntry,
+                  onModeratePending: _moderatePendingEntry,
+                  pendingActionEventIds: _moderatingEventIds,
+                  expandedPendingAttrs: _expandedPendingAttrs,
+                  onTogglePendingAttr: (attrCode) {
+                    setState(() {
+                      if (!_expandedPendingAttrs.add(attrCode)) {
+                        _expandedPendingAttrs.remove(attrCode);
+                      }
+                    });
+                  },
                 ),
                 const SizedBox(height: 16),
                 _EventEditor(

lib/components/pages/loco_timeline/event_editor.dart

@@ -23,6 +23,7 @@ class _EventEditor extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final hasDrafts = drafts.isNotEmpty;
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -37,12 +38,14 @@ class _EventEditor extends StatelessWidget {
             ),
             Row(
               children: [
+                if (!hasDrafts) ...[
                   OutlinedButton.icon(
                     onPressed: onAddEvent,
                     icon: const Icon(Icons.add),
                     label: const Text('New event'),
                   ),
                   const SizedBox(width: 8),
+                ],
                 FilledButton.icon(
                   onPressed: (!canSave || isSaving) ? null : onSave,
                   icon: isSaving
@@ -147,6 +150,14 @@ class _EventEditor extends StatelessWidget {
               );
             },
           ),
+        if (hasDrafts) ...[
+          const SizedBox(height: 8),
+          OutlinedButton.icon(
+            onPressed: onAddEvent,
+            icon: const Icon(Icons.add),
+            label: const Text('New event'),
+          ),
+        ],
       ],
     );
   }

lib/components/pages/loco_timeline/timeline_grid.dart

@@ -2,16 +2,29 @@ part of 'package:mileograph_flutter/components/pages/loco_timeline.dart';
 
 final DateFormat _dateFormat = DateFormat('yyyy-MM-dd');
 
+enum _PendingModerationAction { approve, reject }
+
 class _TimelineGrid extends StatefulWidget {
   const _TimelineGrid({
     required this.entries,
     this.onEditEntry,
     this.onDeleteEntry,
+    this.onModeratePending,
+    this.pendingActionEventIds = const {},
+    this.expandedPendingAttrs = const {},
+    this.onTogglePendingAttr,
   });
 
   final List<LocoAttrVersion> entries;
   final void Function(LocoAttrVersion entry)? onEditEntry;
   final void Function(LocoAttrVersion entry)? onDeleteEntry;
+  final Future<void> Function(
+    LocoAttrVersion entry,
+    _PendingModerationAction action,
+  )? onModeratePending;
+  final Set<int> pendingActionEventIds;
+  final Set<String> expandedPendingAttrs;
+  final void Function(String attrCode)? onTogglePendingAttr;
 
   @override
   State<_TimelineGrid> createState() => _TimelineGridState();
@@ -77,12 +90,15 @@ class _TimelineGridState extends State<_TimelineGrid> {
         'build_day',
       }.contains(code);
     }).toList();
-    final model = _TimelineModel.fromEntries(filteredEntries);
+    final model = _TimelineModel.fromEntries(
+      filteredEntries,
+      expandedAttrCodes: widget.expandedPendingAttrs,
+    );
     final axisSegments = model.axisSegments;
     const labelWidth = 110.0;
     const rowHeight = 52.0;
     const double axisHeight = 48;
-    final rows = model.attrRows.entries.toList();
+    final rows = model.rows;
     final totalRowsHeight = rows.length * rowHeight;
     final axisWidth = math.max(model.axisTotalWidth, 120.0);
     final double viewHeight = totalRowsHeight + axisHeight + 8;
@@ -122,7 +138,12 @@ class _TimelineGridState extends State<_TimelineGrid> {
                           itemExtent: rowHeight,
                           itemCount: rows.length,
                           itemBuilder: (_, index) {
-                            final label = _formatAttrLabel(rows[index].key);
+                            final row = rows[index];
+                            final label = row.isPrimary
+                                ? _formatAttrLabel(row.attrCode)
+                                : (row.pendingUser?.trim().isNotEmpty == true
+                                    ? row.pendingUser!.trim()
+                                    : 'Unknown');
                             return Container(
                               alignment: Alignment.centerLeft,
                               padding: const EdgeInsets.symmetric(
@@ -139,12 +160,49 @@ class _TimelineGridState extends State<_TimelineGrid> {
                                   ),
                                 ),
                               ),
+                              child: Row(
+                                children: [
+                                  if (!row.isPrimary) ...[
+                                    Icon(
+                                      Icons.subdirectory_arrow_right,
+                                      size: 16,
+                                      color: Theme.of(context).hintColor,
+                                    ),
+                                    const SizedBox(width: 6),
+                                  ],
+                                  Expanded(
                                     child: Text(
                                       label,
+                                      maxLines: 1,
+                                      overflow: TextOverflow.ellipsis,
                                       style: Theme.of(context)
                                           .textTheme
                                           .labelLarge
-                                    ?.copyWith(fontWeight: FontWeight.w700),
+                                          ?.copyWith(
+                                            fontWeight: row.isPrimary
+                                                ? FontWeight.w700
+                                                : FontWeight.w600,
+                                          ),
+                                    ),
+                                  ),
+                                  if (row.showExpandToggle)
+                                    IconButton(
+                                      onPressed: widget.onTogglePendingAttr == null
+                                          ? null
+                                          : () => widget.onTogglePendingAttr?.call(
+                                                row.attrCode,
+                                              ),
+                                      icon: Icon(
+                                        row.isExpanded
+                                            ? Icons.expand_less
+                                            : Icons.expand_more,
+                                      ),
+                                      tooltip: row.isExpanded
+                                          ? 'Collapse pending rows'
+                                          : 'Expand pending rows',
+                                      visualDensity: VisualDensity.compact,
+                                    ),
+                                ],
                               ),
                             );
                           },
@@ -179,7 +237,7 @@ class _TimelineGridState extends State<_TimelineGrid> {
                               itemExtent: rowHeight,
                               itemCount: rows.length,
                               itemBuilder: (_, index) {
-                                final blocks = rows[index].value;
+                                final blocks = rows[index].blocks;
                                 return Padding(
                                   padding:
                                       const EdgeInsets.symmetric(vertical: 2.0),
@@ -191,6 +249,8 @@ class _TimelineGridState extends State<_TimelineGrid> {
                                     viewportWidth: axisWidth,
                                     onEditEntry: widget.onEditEntry,
                                     onDeleteEntry: widget.onDeleteEntry,
+                                    onModeratePending: widget.onModeratePending,
+                                    pendingActionEventIds: widget.pendingActionEventIds,
                                   ),
                                 );
                               },
@@ -276,6 +336,8 @@ class _AttrRow extends StatelessWidget {
     required this.viewportWidth,
     this.onEditEntry,
     this.onDeleteEntry,
+    this.onModeratePending,
+    this.pendingActionEventIds = const {},
   });
 
   final double rowHeight;
@@ -285,6 +347,11 @@ class _AttrRow extends StatelessWidget {
   final double viewportWidth;
   final void Function(LocoAttrVersion entry)? onEditEntry;
   final void Function(LocoAttrVersion entry)? onDeleteEntry;
+  final Future<void> Function(
+    LocoAttrVersion entry,
+    _PendingModerationAction action,
+  )? onModeratePending;
+  final Set<int> pendingActionEventIds;
 
   @override
   Widget build(BuildContext context) {
@@ -310,6 +377,8 @@ class _AttrRow extends StatelessWidget {
                 block: block,
                 onEditEntry: onEditEntry,
                 onDeleteEntry: onDeleteEntry,
+                onModeratePending: onModeratePending,
+                pendingActionEventIds: pendingActionEventIds,
               ),
             ),
           if (activeBlock != null)
@@ -326,6 +395,7 @@ class _AttrRow extends StatelessWidget {
                       width: stickyWidth,
                     ),
                     clipLeftEdge: scrollOffset > activeBlock.left + 0.1,
+                    pendingActionEventIds: pendingActionEventIds,
                   ),
                 ),
               ),
@@ -347,20 +417,27 @@ class _ValueBlockView extends StatelessWidget {
   const _ValueBlockView({
     required this.block,
     this.clipLeftEdge = false,
+    this.pendingActionEventIds = const {},
   });
 
   final _ValueBlock block;
   final bool clipLeftEdge;
+  final Set<int> pendingActionEventIds;
 
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final color = block.cell.color.withValues(alpha: 0.9);
+    final color = block.cell.color;
     final textColor = ThemeData.estimateBrightnessForColor(color) ==
             Brightness.dark
         ? Colors.white
         : Colors.black87;
 
+    final entry = block.entry;
+    final eventId = entry?.sourceEventId;
+    final isPendingAction =
+        entry?.isPending == true && eventId != null && pendingActionEventIds.contains(eventId);
+
     final radius = BorderRadius.only(
       topLeft: Radius.circular(clipLeftEdge ? 0 : 12),
       bottomLeft: Radius.circular(clipLeftEdge ? 0 : 12),
@@ -386,10 +463,35 @@ class _ValueBlockView extends StatelessWidget {
                 fit: BoxFit.scaleDown,
                 child: ConstrainedBox(
                   constraints: const BoxConstraints(minWidth: 1, minHeight: 1),
-                  child: Column(
+                  child: Row(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
+                          Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              if (block.cell.isPending)
+                                Padding(
+                                  padding: const EdgeInsets.only(right: 6),
+                                  child: SizedBox(
+                                    width: 16,
+                                    height: 16,
+                                    child: isPendingAction
+                                        ? CircularProgressIndicator(
+                                            strokeWidth: 2,
+                                            valueColor:
+                                                AlwaysStoppedAnimation(textColor),
+                                          )
+                                        : Icon(
+                                            Icons.pending,
+                                            size: 16,
+                                            color: textColor,
+                                          ),
+                                  ),
+                                ),
                               Text(
                                 block.cell.value,
                                 maxLines: 1,
@@ -403,6 +505,8 @@ class _ValueBlockView extends StatelessWidget {
                                       color: textColor,
                                     ),
                               ),
+                            ],
+                          ),
                           const SizedBox(height: 4),
                           Text(
                             block.cell.rangeLabel,
@@ -411,7 +515,11 @@ class _ValueBlockView extends StatelessWidget {
                             style: theme.textTheme.labelSmall?.copyWith(
                                   color: textColor.withValues(alpha: 0.9),
                                 ) ??
-                            TextStyle(color: textColor.withValues(alpha: 0.9)),
+                                TextStyle(
+                                  color: textColor.withValues(alpha: 0.9),
+                                ),
+                          ),
+                        ],
                       ),
                     ],
                   ),
@@ -422,26 +530,48 @@ class _ValueBlockView extends StatelessWidget {
   }
 }
 
-enum _TimelineBlockAction { edit, delete }
+enum _TimelineBlockAction { edit, delete, approve, reject }
 
 class _ValueBlockMenu extends StatelessWidget {
   const _ValueBlockMenu({
     required this.block,
     this.onEditEntry,
     this.onDeleteEntry,
+    this.onModeratePending,
+    this.pendingActionEventIds = const {},
   });
 
   final _ValueBlock block;
   final void Function(LocoAttrVersion entry)? onEditEntry;
   final void Function(LocoAttrVersion entry)? onDeleteEntry;
+  final Future<void> Function(
+    LocoAttrVersion entry,
+    _PendingModerationAction action,
+  )? onModeratePending;
+  final Set<int> pendingActionEventIds;
 
-  bool get _hasActions => onEditEntry != null || onDeleteEntry != null;
+  bool get _hasActions {
+    final canModerate = block.entry?.isPending == true &&
+        block.entry?.canModeratePending == true &&
+        onModeratePending != null;
+    final canEdit = onEditEntry != null && block.entry?.isPending != true;
+    return onDeleteEntry != null || canModerate || canEdit;
+  }
 
   @override
   Widget build(BuildContext context) {
     if (!_hasActions || block.entry == null) {
-      return _ValueBlockView(block: block);
+      return _ValueBlockView(
+        block: block,
+      );
     }
+    final canModerate = block.entry?.isPending == true &&
+        block.entry?.canModeratePending == true &&
+        onModeratePending != null;
+    final canEdit = onEditEntry != null && block.entry?.isPending != true;
+    final eventId = block.entry?.sourceEventId;
+    final isPendingAction =
+        eventId != null && pendingActionEventIds.contains(eventId);
 
     Future<void> showContextMenuAt(Offset globalPosition) async {
       final overlay = Overlay.of(context);
@@ -459,11 +589,23 @@ class _ValueBlockMenu extends StatelessWidget {
         context: context,
         position: position,
         items: [
-          if (onEditEntry != null)
+          if (canEdit)
             const PopupMenuItem(
               value: _TimelineBlockAction.edit,
               child: Text('Edit'),
             ),
+          if (canModerate)
+            PopupMenuItem(
+              value: _TimelineBlockAction.approve,
+              enabled: !isPendingAction,
+              child: const Text('Approve pending'),
+            ),
+          if (canModerate)
+            PopupMenuItem(
+              value: _TimelineBlockAction.reject,
+              enabled: !isPendingAction,
+              child: const Text('Reject pending'),
+            ),
           if (onDeleteEntry != null)
             const PopupMenuItem(
               value: _TimelineBlockAction.delete,
@@ -481,11 +623,17 @@ class _ValueBlockMenu extends StatelessWidget {
         case _TimelineBlockAction.delete:
           onDeleteEntry?.call(entry);
           break;
+        case _TimelineBlockAction.approve:
+          onModeratePending?.call(entry, _PendingModerationAction.approve);
+          break;
+        case _TimelineBlockAction.reject:
+          onModeratePending?.call(entry, _PendingModerationAction.reject);
+          break;
       }
     }
 
     return GestureDetector(
-      behavior: HitTestBehavior.opaque,
+      behavior: HitTestBehavior.deferToChild,
       onLongPressStart: (details) async {
         if (defaultTargetPlatform == TargetPlatform.android) {
           HapticFeedback.lightImpact();
@@ -495,7 +643,10 @@ class _ValueBlockMenu extends StatelessWidget {
       onSecondaryTapDown: (details) async {
         await showContextMenuAt(details.globalPosition);
       },
-      child: _ValueBlockView(block: block),
+      child: _ValueBlockView(
+        block: block,
+        pendingActionEventIds: pendingActionEventIds,
+      ),
     );
   }
 }
@@ -518,7 +669,28 @@ String _formatAttrLabel(String code) {
 
 DateTime? _parseDateString(String? value) {
   if (value == null || value.isEmpty) return null;
-  return DateTime.tryParse(value);
+  final direct = DateTime.tryParse(value);
+  if (direct != null) return direct;
+  final maskedMatch =
+      RegExp(r'^(\\d{4})-(\\d{2}|xx|XX)-(\\d{2}|xx|XX)\$').firstMatch(value);
+  if (maskedMatch != null) {
+    final year = int.tryParse(maskedMatch.group(1) ?? '');
+    if (year == null) return null;
+    String normalize(String part, int fallback) {
+      final lower = part.toLowerCase();
+      if (lower == 'xx') return fallback.toString().padLeft(2, '0');
+      return part;
+    }
+
+    final month = int.tryParse(normalize(maskedMatch.group(2) ?? '01', 1)) ?? 1;
+    final day = int.tryParse(normalize(maskedMatch.group(3) ?? '01', 1)) ?? 1;
+    try {
+      return DateTime(year, month.clamp(1, 12), day.clamp(1, 31));
+    } catch (_) {
+      return null;
+    }
+  }
+  return null;
 }
 
 DateTime? _effectiveStart(LocoAttrVersion entry) {
@@ -534,44 +706,43 @@ DateTime _safeEnd(DateTime start, DateTime? end) {
   return end;
 }
 
-class _TimelineModel {
+int _startKey(DateTime date) => date.year * 10000 + date.month * 100 + date.day;
-  final List<_AxisSegment> axisSegments;
-  final Map<String, List<_ValueBlock>> attrRows;
-  final String endLabel;
-  final List<DateTime> boundaries;
-  final double axisTotalWidth;
 
-  _TimelineModel({
+bool _isOverlappingStart(LocoAttrVersion entry, Set<int> approvedStartKeys) {
-    required this.axisSegments,
+  final start = _effectiveStart(entry);
-    required this.attrRows,
+  if (start == null) return false;
-    required this.endLabel,
+  return approvedStartKeys.contains(_startKey(start));
-    required this.boundaries,
-    required this.axisTotalWidth,
-  });
-
-  factory _TimelineModel.fromEntries(List<LocoAttrVersion> entries) {
-    final grouped = <String, List<LocoAttrVersion>>{};
-    for (final entry in entries) {
-      grouped.putIfAbsent(entry.attrCode, () => []).add(entry);
 }
-    final now = DateTime.now();
-    DateTime? minStart;
-    DateTime? maxEnd;
-    final attrSegments = <String, List<_ValueSegment>>{};
 
-    grouped.forEach((attr, items) {
+List<_ValueSegment> _segmentsForEntries(
-      items.sort(
+  List<LocoAttrVersion> items,
+  DateTime now, {
+  bool? clampToNextStart,
+}) {
+  if (items.isEmpty) return const [];
+  final hasPending = items.any((e) => e.isPending);
+  final hasApproved = items.any((e) => !e.isPending);
+  final shouldClamp =
+      clampToNextStart ?? (hasPending && hasApproved);
+  final sorted = [...items];
+  sorted.sort(
     (a, b) => (_effectiveStart(a) ?? now)
         .compareTo(_effectiveStart(b) ?? now),
   );
   final segments = <_ValueSegment>[];
-      for (int i = 0; i < items.length; i++) {
+  for (int i = 0; i < sorted.length; i++) {
-        final entry = items[i];
+    final entry = sorted[i];
     final start = _effectiveStart(entry) ?? now;
-        final nextStart = i < items.length - 1
+    final nextStart = i < sorted.length - 1
-            ? _effectiveStart(items[i + 1])
+        ? _effectiveStart(sorted[i + 1])
         : null;
-        final rawEnd = entry.validTo ?? nextStart ?? now;
+    DateTime? rawEnd = entry.validTo;
+    if (nextStart != null) {
+      if (rawEnd == null || (shouldClamp && nextStart.isBefore(rawEnd))) {
+        rawEnd = nextStart;
+      }
+    }
+    rawEnd ??= now;
     final end = _safeEnd(start, rawEnd);
     segments.add(
       _ValueSegment(
@@ -581,29 +752,264 @@ class _TimelineModel {
         entry: entry,
       ),
     );
-        minStart = minStart == null || start.isBefore(minStart!)
-            ? start
-            : minStart;
-        maxEnd = maxEnd == null || end.isAfter(maxEnd!) ? end : maxEnd;
   }
-      attrSegments[attr] = segments;
+  return segments;
-    });
+}
 
-    minStart ??= now.subtract(const Duration(days: 1));
+List<LocoAttrVersion> _applyPendingOverrides(
-    final effectiveMaxEnd = maxEnd ?? now;
+  List<LocoAttrVersion> approved,
+  List<LocoAttrVersion> pending,
+) {
+  if (pending.isEmpty) return approved;
+  final pendingByStart = <int, LocoAttrVersion>{};
+  final extraPending = <LocoAttrVersion>[];
+  for (final entry in pending) {
+    final start = _effectiveStart(entry);
+    if (start == null) continue;
+    final key = _startKey(start);
+    pendingByStart[key] = entry;
+  }
 
+  final applied = <LocoAttrVersion>[];
+  final seenKeys = <int>{};
+  for (final entry in approved) {
+    final start = _effectiveStart(entry);
+    if (start == null) continue;
+    final key = _startKey(start);
+    if (pendingByStart.containsKey(key)) {
+      if (!seenKeys.contains(key)) {
+        applied.add(pendingByStart[key]!);
+        seenKeys.add(key);
+      }
+    } else {
+      applied.add(entry);
+      seenKeys.add(key);
+    }
+  }
+
+  for (final entry in pendingByStart.values) {
+    final start = _effectiveStart(entry);
+    if (start == null) continue;
+    final key = _startKey(start);
+    if (!seenKeys.contains(key)) {
+      extraPending.add(entry);
+      seenKeys.add(key);
+    }
+  }
+
+  if (extraPending.isNotEmpty) {
+    applied.addAll(extraPending);
+  }
+  return applied;
+}
+
+List<DateTime> _buildBoundaries(
+  List<_ValueSegment> segments,
+  DateTime now,
+) {
+  DateTime? minStart;
+  DateTime? maxEnd;
   final boundaryDates = <DateTime>{};
-    for (final segments in attrSegments.values) {
   for (final seg in segments) {
     boundaryDates.add(seg.start);
     boundaryDates.add(seg.end);
+    minStart = minStart == null || seg.start.isBefore(minStart!)
+        ? seg.start
+        : minStart;
+    maxEnd = maxEnd == null || seg.end.isAfter(maxEnd!) ? seg.end : maxEnd;
   }
-    }
+  minStart ??= now.subtract(const Duration(days: 1));
+  final effectiveMaxEnd = maxEnd ?? now;
   boundaryDates.add(effectiveMaxEnd);
   var boundaries = boundaryDates.toList()..sort();
   if (boundaries.length < 2) {
     boundaries = [minStart!, effectiveMaxEnd];
   }
+  return boundaries;
+}
+
+class _TimelineRowSpec {
+  final String id;
+  final String attrCode;
+  final List<_ValueSegment> segments;
+  final bool isPrimary;
+  final bool showExpandToggle;
+  final bool isExpanded;
+  final String? userLabel;
+
+  const _TimelineRowSpec._({
+    required this.id,
+    required this.attrCode,
+    required this.segments,
+    required this.isPrimary,
+    required this.showExpandToggle,
+    required this.isExpanded,
+    this.userLabel,
+  });
+
+  factory _TimelineRowSpec.primary({
+    required String attrCode,
+    required List<_ValueSegment> segments,
+    required bool showExpandToggle,
+    required bool isExpanded,
+  }) {
+    return _TimelineRowSpec._(
+      id: attrCode,
+      attrCode: attrCode,
+      segments: segments,
+      isPrimary: true,
+      showExpandToggle: showExpandToggle,
+      isExpanded: isExpanded,
+    );
+  }
+
+  factory _TimelineRowSpec.pending({
+    required String attrCode,
+    required String userLabel,
+    required List<_ValueSegment> segments,
+  }) {
+    return _TimelineRowSpec._(
+      id: '$attrCode::$userLabel',
+      attrCode: attrCode,
+      segments: segments,
+      isPrimary: false,
+      showExpandToggle: false,
+      isExpanded: false,
+      userLabel: userLabel,
+    );
+  }
+}
+
+class _TimelineRowData {
+  final String id;
+  final String attrCode;
+  final List<_ValueBlock> blocks;
+  final bool isPrimary;
+  final bool showExpandToggle;
+  final bool isExpanded;
+  final String? pendingUser;
+
+  const _TimelineRowData({
+    required this.id,
+    required this.attrCode,
+    required this.blocks,
+    required this.isPrimary,
+    required this.showExpandToggle,
+    required this.isExpanded,
+    this.pendingUser,
+  });
+}
+
+class _TimelineModel {
+  final List<_AxisSegment> axisSegments;
+  final List<_TimelineRowData> rows;
+  final String endLabel;
+  final List<DateTime> boundaries;
+  final double axisTotalWidth;
+
+  _TimelineModel({
+    required this.axisSegments,
+    required this.rows,
+    required this.endLabel,
+    required this.boundaries,
+    required this.axisTotalWidth,
+  });
+
+  factory _TimelineModel.fromEntries(
+    List<LocoAttrVersion> entries, {
+    Set<String> expandedAttrCodes = const {},
+  }) {
+    final effectiveEntries = entries
+        .where((e) => _effectiveStart(e) != null)
+        .toList();
+    final grouped = <String, List<LocoAttrVersion>>{};
+    final attrOrder = <String>[];
+    for (final entry in effectiveEntries) {
+      final key = entry.attrCode;
+      if (!grouped.containsKey(key)) {
+        attrOrder.add(key);
+      }
+      grouped.putIfAbsent(key, () => []).add(entry);
+    }
+    final now = DateTime.now();
+    final allSegments = <_ValueSegment>[];
+    final rowSpecs = <_TimelineRowSpec>[];
+    for (final attr in attrOrder) {
+      final items = grouped[attr] ?? const [];
+      final approved = items.where((e) => !e.isPending).toList();
+      final pending = items.where((e) => e.isPending).toList();
+      final approvedSegments = _segmentsForEntries(approved, now);
+
+      final approvedStartKeys = <int>{};
+      for (final entry in approved) {
+        final start = _effectiveStart(entry);
+        if (start == null) continue;
+        approvedStartKeys.add(_startKey(start));
+      }
+
+      final pendingByUser = <String, List<LocoAttrVersion>>{};
+      final overlapByUser = <String, List<LocoAttrVersion>>{};
+      for (final entry in pending) {
+        final user = (entry.suggestedBy ?? '').trim().isEmpty
+            ? 'Unknown'
+            : entry.suggestedBy!.trim();
+        pendingByUser.putIfAbsent(user, () => []).add(entry);
+        final start = _effectiveStart(entry);
+        if (start == null) continue;
+        if (approvedStartKeys.contains(_startKey(start))) {
+          overlapByUser.putIfAbsent(user, () => []).add(entry);
+        }
+      }
+
+      final hasOverlap = overlapByUser.isNotEmpty;
+      final canToggle = pending.isNotEmpty && !hasOverlap;
+      final isExpanded = expandedAttrCodes.contains(attr);
+      final shouldShowPendingRows = isExpanded || hasOverlap;
+
+      final nonOverlapPending =
+          pending.where((e) => !_isOverlappingStart(e, approvedStartKeys)).toList();
+      final baseEntries =
+          shouldShowPendingRows ? approved : [...approved, ...nonOverlapPending];
+      final baseSegments = shouldShowPendingRows
+          ? approvedSegments
+          : _segmentsForEntries(baseEntries, now);
+
+      rowSpecs.add(
+        _TimelineRowSpec.primary(
+          attrCode: attr,
+          segments: baseSegments,
+          showExpandToggle: canToggle,
+          isExpanded: isExpanded,
+        ),
+      );
+      allSegments.addAll(baseSegments);
+
+      if (shouldShowPendingRows) {
+        final users = isExpanded
+            ? pendingByUser.keys.toList()
+            : overlapByUser.keys.toList();
+        users.sort();
+        for (final user in users) {
+          final pendingEntries = isExpanded
+              ? (pendingByUser[user] ?? const [])
+              : (overlapByUser[user] ?? const []);
+          if (pendingEntries.isEmpty) continue;
+          final appliedEntries =
+              _applyPendingOverrides(approved, pendingEntries);
+          final combinedSegments = _segmentsForEntries(appliedEntries, now);
+          rowSpecs.add(
+            _TimelineRowSpec.pending(
+              attrCode: attr,
+              userLabel: user,
+              segments: combinedSegments,
+            ),
+          );
+          allSegments.addAll(combinedSegments);
+        }
+      }
+    }
+
+    final boundaries = _buildBoundaries(allSegments, now);
 
     final axisSegments = <_AxisSegment>[];
     const double yearWidth = 240.0;
@@ -627,10 +1033,10 @@ class _TimelineModel {
     final axisTotalWidth =
         axisSegments.fold<double>(0, (sum, seg) => sum + seg.width);
 
-    final attrRows = <String, List<_ValueBlock>>{};
+    final rows = <_TimelineRowData>[];
-    for (final entry in attrSegments.entries) {
+    for (final spec in rowSpecs) {
       final blocks = <_ValueBlock>[];
-      for (final seg in entry.value) {
+      for (final seg in spec.segments) {
         final left = _positionForDate(seg.start, boundaries, axisSegments);
         final right = _positionForDate(seg.end, boundaries, axisSegments);
         final span = right - left;
@@ -644,13 +1050,24 @@ class _TimelineModel {
           ),
         );
       }
-      attrRows[entry.key] = blocks;
+      rows.add(
+        _TimelineRowData(
+          id: spec.id,
+          attrCode: spec.attrCode,
+          blocks: blocks,
+          isPrimary: spec.isPrimary,
+          showExpandToggle: spec.showExpandToggle,
+          isExpanded: spec.isExpanded,
+          pendingUser: spec.userLabel,
+        ),
+      );
     }
 
-    final endLabel = _formatDate(effectiveMaxEnd) ?? 'Now';
+    final endLabel =
+        boundaries.isNotEmpty ? _formatDate(boundaries.last) ?? 'Now' : 'Now';
     return _TimelineModel(
       axisSegments: axisSegments,
-      attrRows: attrRows,
+      rows: rows,
       endLabel: endLabel,
       boundaries: boundaries,
       axisTotalWidth: axisTotalWidth,
@@ -774,11 +1191,13 @@ class _RowCell {
   final String value;
   final String rangeLabel;
   final Color color;
+  final bool isPending;
 
   const _RowCell({
     required this.value,
     required this.rangeLabel,
     required this.color,
+    this.isPending = false,
   });
 
   factory _RowCell.fromSegment(_ValueSegment seg) {
@@ -787,6 +1206,7 @@ class _RowCell {
         value: '',
         rangeLabel: '',
         color: Colors.transparent,
+        isPending: false,
       );
     }
     final entry = seg.entry;
@@ -802,6 +1222,7 @@ class _RowCell {
       value: seg.value,
       rangeLabel: displayStart,
       color: _colorForValue(seg.value),
+      isPending: entry?.isPending ?? false,
     );
   }
 }

lib/components/pages/more/admin_page.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/api_service.dart';
@@ -354,6 +355,18 @@ class _AdminPageState extends State<AdminPage> {
     return Scaffold(
       appBar: AppBar(
         title: const Text('Admin'),
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () {
+            final navigator = Navigator.of(context);
+            if (navigator.canPop()) {
+              navigator.maybePop();
+            } else {
+              context.go('/more');
+            }
+          },
+          tooltip: 'Back',
+        ),
       ),
       body: ListView(
         padding: const EdgeInsets.all(16),

lib/components/pages/new_entry/new_entry_submit_logic.dart

@@ -232,16 +232,16 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     if (!mounted) return false;
     final result = await showDialog<bool>(
       context: context,
-      builder: (_) => AlertDialog(
+      builder: (dialogContext) => AlertDialog(
         title: const Text('Duplicate entry?'),
         content: const Text('Entry already added, are you sure?'),
         actions: [
           TextButton(
-            onPressed: () => Navigator.of(context).pop(false),
+            onPressed: () => Navigator.of(dialogContext).pop(false),
             child: const Text('Cancel'),
           ),
           ElevatedButton(
-            onPressed: () => Navigator.of(context).pop(true),
+            onPressed: () => Navigator.of(dialogContext).pop(true),
             child: const Text('Submit anyway'),
           ),
         ],

lib/components/pages/profile.dart

@@ -127,6 +127,9 @@ class _ProfilePageState extends State<ProfilePage> {
           );
       if (!mounted) return;
       setState(() => _status = status);
+      final data = context.read<DataService>();
+      await data.fetchFriendships();
+      await data.fetchPendingFriendships();
       _showSnack('Friend request sent');
     } catch (e) {
       _showSnack('Failed to send request: $e');
@@ -159,6 +162,7 @@ class _ProfilePageState extends State<ProfilePage> {
       final updated = await context.read<DataService>().acceptFriendship(id);
       if (!mounted) return;
       setState(() => _status = updated);
+      await context.read<DataService>().fetchFriendships();
       _showSnack('Friend request accepted');
     } catch (e) {
       _showSnack('Failed to accept: $e');
@@ -175,6 +179,7 @@ class _ProfilePageState extends State<ProfilePage> {
       final updated = await context.read<DataService>().rejectFriendship(id);
       if (!mounted) return;
       setState(() => _status = updated);
+      await context.read<DataService>().fetchPendingFriendships();
       _showSnack('Friend request rejected');
     } catch (e) {
       _showSnack('Failed to reject: $e');
@@ -363,6 +368,18 @@ class _ProfilePageState extends State<ProfilePage> {
 
     return Scaffold(
       appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () {
+            final nav = Navigator.of(context);
+            if (nav.canPop()) {
+              nav.maybePop();
+            } else {
+              context.go('/more');
+            }
+          },
+          tooltip: 'Back',
+        ),
         title: const Text('Profile'),
       ),
       body: RefreshIndicator(

lib/components/pages/settings.dart

@@ -3,8 +3,10 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:http/http.dart' as http;
+import 'package:mileograph_flutter/services/accent_color_service.dart';
 import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:mileograph_flutter/services/endpoint_service.dart';
+import 'package:mileograph_flutter/services/theme_mode_service.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:provider/provider.dart';
 
@@ -18,6 +20,18 @@ class SettingsPage extends StatefulWidget {
 class _SettingsPageState extends State<SettingsPage> {
   late final TextEditingController _endpointController;
   bool _saving = false;
+  static const List<Color> _accentPalette = [
+    Colors.red,
+    Colors.pink,
+    Colors.orange,
+    Colors.amber,
+    Colors.green,
+    Colors.teal,
+    Colors.blue,
+    Colors.indigo,
+    Colors.purple,
+    Colors.cyan,
+  ];
 
   @override
   void initState() {
@@ -130,7 +144,12 @@ class _SettingsPageState extends State<SettingsPage> {
   Widget build(BuildContext context) {
     final endpointService = context.watch<EndpointService>();
     final distanceUnitService = context.watch<DistanceUnitService>();
-    if (!endpointService.isLoaded || !distanceUnitService.isLoaded) {
+    final accentService = context.watch<AccentColorService>();
+    final themeModeService = context.watch<ThemeModeService>();
+    if (!endpointService.isLoaded ||
+        !distanceUnitService.isLoaded ||
+        !accentService.isLoaded ||
+        !themeModeService.isLoaded) {
       return const Scaffold(
         body: Center(child: CircularProgressIndicator()),
       );
@@ -146,7 +165,7 @@ class _SettingsPageState extends State<SettingsPage> {
             if (navigator.canPop()) {
               navigator.pop();
             } else {
-              context.go('/');
+              context.go('/more');
             }
           },
         ),
@@ -184,6 +203,73 @@ class _SettingsPageState extends State<SettingsPage> {
               },
             ),
             const SizedBox(height: 24),
+            Text(
+              'Accent colour',
+              style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w700,
+                  ),
+            ),
+            const SizedBox(height: 8),
+            Text(
+              'Choose your preferred accent colour or use system colours.',
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+            const SizedBox(height: 12),
+            Wrap(
+              spacing: 12,
+              runSpacing: 8,
+              crossAxisAlignment: WrapCrossAlignment.center,
+              children: [
+                OutlinedButton.icon(
+                  onPressed:
+                      accentService.useSystem ? null : () => accentService.setUseSystem(true),
+                  icon: const Icon(Icons.phone_android),
+                  label: const Text('Use system colours'),
+                ),
+                ..._accentPalette.map(
+                  (color) => _AccentSwatchButton(
+                    color: color,
+                    selected:
+                        !accentService.useSystem &&
+                            accentService.seedColor.toARGB32() == color.toARGB32(),
+                    onTap: () => accentService.setSeedColor(color),
+                  ),
+                ),
+              ],
+            ),
+            const SizedBox(height: 24),
+            Text(
+              'Theme mode',
+              style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w700,
+                  ),
+            ),
+            const SizedBox(height: 8),
+            SegmentedButton<ThemeMode>(
+              segments: const [
+                ButtonSegment(
+                  value: ThemeMode.system,
+                  icon: Icon(Icons.settings_suggest),
+                  label: Text('System'),
+                ),
+                ButtonSegment(
+                  value: ThemeMode.light,
+                  icon: Icon(Icons.light_mode),
+                  label: Text('Light'),
+                ),
+                ButtonSegment(
+                  value: ThemeMode.dark,
+                  icon: Icon(Icons.dark_mode),
+                  label: Text('Dark'),
+                ),
+              ],
+              selected: {themeModeService.mode},
+              onSelectionChanged: (selection) {
+                final mode = selection.first;
+                themeModeService.setMode(mode);
+              },
+            ),
+            const SizedBox(height: 24),
             Text(
               'API endpoint',
               style: Theme.of(context).textTheme.titleMedium?.copyWith(
@@ -241,3 +327,54 @@ class _SettingsPageState extends State<SettingsPage> {
     );
   }
 }
+
+class _AccentSwatchButton extends StatelessWidget {
+  const _AccentSwatchButton({
+    required this.color,
+    required this.selected,
+    required this.onTap,
+  });
+
+  final Color color;
+  final bool selected;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    final borderColor = selected
+        ? Theme.of(context).colorScheme.onSurface
+        : Colors.black26;
+    return InkWell(
+      onTap: onTap,
+      customBorder: const CircleBorder(),
+      child: Container(
+        width: 40,
+        height: 40,
+        decoration: BoxDecoration(
+          color: color,
+          shape: BoxShape.circle,
+          border: Border.all(
+            color: borderColor,
+            width: selected ? 3 : 1,
+          ),
+          boxShadow: [
+            BoxShadow(
+              color: Colors.black.withValues(alpha: 0.15),
+              blurRadius: 4,
+              offset: const Offset(0, 2),
+            ),
+          ],
+        ),
+        child: selected
+            ? const Center(
+                child: Icon(
+                  Icons.check,
+                  size: 18,
+                  color: Colors.white,
+                ),
+              )
+            : null,
+      ),
+    );
+  }
+}

lib/components/pages/stats.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:intl/intl.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
@@ -32,7 +33,21 @@ class _StatsPageState extends State<StatsPage> {
     final data = context.watch<DataService>();
     final distanceUnits = context.watch<DistanceUnitService>();
     return Scaffold(
-      appBar: AppBar(title: const Text('Stats')),
+      appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () {
+            final nav = Navigator.of(context);
+            if (nav.canPop()) {
+              nav.maybePop();
+            } else {
+              context.go('/more');
+            }
+          },
+          tooltip: 'Back',
+        ),
+        title: const Text('Stats'),
+      ),
       body: RefreshIndicator(
         onRefresh: () => _loadStats(force: true),
         child: _buildContent(data, distanceUnits),

lib/components/pages/traction/traction_page.dart

@@ -1,14 +1,29 @@
 part of 'traction.dart';
 
+enum _TractionMoreAction {
+  classStats,
+  classLeaderboard,
+  adminPending,
+  adminPendingChanges,
+}
+
 class TractionPage extends StatefulWidget {
   const TractionPage({
     super.key,
     this.selectionMode = false,
+    this.selectionSingle = false,
+    this.replacementPendingLocoId,
+    this.transferFromLabel,
+    this.transferFromLocoId,
     this.onSelect,
     this.selectedKeys = const {},
   });
 
   final bool selectionMode;
+  final bool selectionSingle;
+  final int? replacementPendingLocoId;
+  final String? transferFromLabel;
+  final int? transferFromLocoId;
   final ValueChanged<LocoSummary>? onSelect;
   final Set<String> selectedKeys;
 
@@ -23,6 +38,7 @@ class _TractionPageState extends State<TractionPage> {
   final _nameController = TextEditingController();
   bool _mileageFirst = true;
   bool _initialised = false;
+  int? get _transferFromLocoId => widget.transferFromLocoId;
   bool _showAdvancedFilters = false;
   String? _selectedClass;
   late Set<String> _selectedKeys;
@@ -48,6 +64,8 @@ class _TractionPageState extends State<TractionPage> {
   static const int _pageSize = 100;
   int _lastTractionOffset = 0;
   String? _lastQuerySignature;
+  String? _transferFromLabel;
+  bool _isSearching = false;
 
   @override
   void initState() {
@@ -61,6 +79,7 @@ class _TractionPageState extends State<TractionPage> {
     if (!_initialised) {
       _initialised = true;
       _selectedKeys = {...widget.selectedKeys};
+      _transferFromLabel = widget.transferFromLabel;
       WidgetsBinding.instance.addPostFrameCallback((_) {
         _initialLoad();
       });
@@ -69,12 +88,16 @@ class _TractionPageState extends State<TractionPage> {
 
   Future<void> _initialLoad() async {
     final data = context.read<DataService>();
+    final auth = context.read<AuthService>();
     await _restoreSearchState();
     if (_lastTractionOffset == 0 && data.traction.length > _pageSize) {
       _lastTractionOffset = data.traction.length - _pageSize;
     }
     data.fetchClassList();
     data.fetchEventFields();
+    if (auth.isElevated) {
+      unawaited(data.fetchPendingLocoCount());
+    }
     await _refreshTraction();
   }
 
@@ -140,6 +163,7 @@ class _TractionPageState extends State<TractionPage> {
     bool append = false,
     bool preservePosition = true,
   }) async {
+    _setState(() => _isSearching = true);
     final data = context.read<DataService>();
     final filters = <String, dynamic>{};
     final name = _nameController.text.trim();
@@ -198,6 +222,7 @@ class _TractionPageState extends State<TractionPage> {
     }
 
     await _persistSearchState();
+    _setState(() => _isSearching = false);
   }
 
   void _clearFilters() {
@@ -296,6 +321,7 @@ class _TractionPageState extends State<TractionPage> {
     final isMobile = MediaQuery.of(context).size.width < 700;
     _syncControllersForFields(data.eventFields);
     final extraFields = _activeEventFields(data.eventFields);
+    final transferBanner = _buildTransferBanner(data);
 
     final slivers = <Widget>[
       SliverPadding(
@@ -325,6 +351,10 @@ class _TractionPageState extends State<TractionPage> {
                   _buildHeaderActions(context, isMobile),
                 ],
               ),
+              if (transferBanner != null) ...[
+                const SizedBox(height: 8),
+                transferBanner,
+              ],
               const SizedBox(height: 12),
               Card(
                 child: Padding(
@@ -474,8 +504,25 @@ class _TractionPageState extends State<TractionPage> {
                           ),
                           ElevatedButton.icon(
                             onPressed: _refreshTraction,
-                            icon: const Icon(Icons.search),
+                            icon: (_isSearching || data.isTractionLoading)
-                            label: const Text('Search'),
+                                ? SizedBox(
+                                    width: 16,
+                                    height: 16,
+                                    child: CircularProgressIndicator(
+                                      strokeWidth: 2,
+                                      valueColor: AlwaysStoppedAnimation<Color>(
+                                        Theme.of(context)
+                                            .colorScheme
+                                            .onPrimary,
+                                      ),
+                                    ),
+                                  )
+                                : const Icon(Icons.search),
+                            label: Text(
+                              (_isSearching || data.isTractionLoading)
+                                  ? 'Searching...'
+                                  : 'Search',
+                            ),
                           ),
                         ],
                       ),
@@ -600,38 +647,21 @@ class _TractionPageState extends State<TractionPage> {
 
   Widget _buildHeaderActions(BuildContext context, bool isMobile) {
     final isElevated = context.read<AuthService>().isElevated;
+    final data = context.watch<DataService>();
+    final pendingCount = data.pendingLocoCount;
+    String? pendingLabel;
+    if (pendingCount > 0) {
+      pendingLabel = pendingCount > 999 ? '999+' : pendingCount.toString();
+    }
     final refreshButton = IconButton(
       tooltip: 'Refresh',
       onPressed: _refreshTraction,
       icon: const Icon(Icons.refresh),
     );
 
-    final classStatsButton = !_hasClassQuery
+    final hasClassActions = _hasClassQuery;
-        ? null
-        : FilledButton.tonalIcon(
-            onPressed: _toggleClassStatsPanel,
-            icon: Icon(
-              _showClassStatsPanel ? Icons.bar_chart : Icons.insights,
-            ),
-            label: Text(
-              _showClassStatsPanel ? 'Hide class stats' : 'Class stats',
-            ),
-          );
-    final classLeaderboardButton = !_hasClassQuery
-        ? null
-        : FilledButton.tonalIcon(
-            onPressed: _toggleClassLeaderboardPanel,
-            icon: Icon(
-              _showClassLeaderboardPanel ? Icons.emoji_events : Icons.leaderboard,
-            ),
-            label: Text(
-              _showClassLeaderboardPanel ? 'Hide class leaderboard' : 'Class leaderboard',
-            ),
-          );
 
-    final newTractionButton = !isElevated
+    final newTractionButton = FilledButton.icon(
-        ? null
-        : FilledButton.icon(
       onPressed: () async {
         final createdClass = await context.push<String>(
           '/traction/new',
@@ -649,17 +679,142 @@ class _TractionPageState extends State<TractionPage> {
       label: const Text('New Traction'),
     );
 
+    final hasAdminActions = isElevated;
+    final hasMoreMenu = hasClassActions || hasAdminActions;
+
+    final moreButton = !hasMoreMenu
+        ? null
+        : PopupMenuButton<_TractionMoreAction>(
+            tooltip: 'More options',
+            onSelected: (action) async {
+              switch (action) {
+                case _TractionMoreAction.classStats:
+                  _toggleClassStatsPanel();
+                  break;
+                case _TractionMoreAction.classLeaderboard:
+                  _toggleClassLeaderboardPanel();
+                  break;
+                case _TractionMoreAction.adminPending:
+                  final messenger = ScaffoldMessenger.of(context);
+                  try {
+                    await context.push('/traction/pending');
+                    if (!mounted) return;
+                    await data.fetchPendingLocoCount();
+                  } catch (_) {
+                    if (!mounted) return;
+                    messenger.showSnackBar(
+                      const SnackBar(
+                        content: Text('Unable to open pending locos'),
+                      ),
+                    );
+                  }
+                  break;
+                case _TractionMoreAction.adminPendingChanges:
+                  final messenger = ScaffoldMessenger.of(context);
+                  try {
+                    await context.push('/traction/changes');
+                  } catch (_) {
+                    if (!mounted) return;
+                    messenger.showSnackBar(
+                      const SnackBar(
+                        content: Text('Unable to open pending changes'),
+                      ),
+                    );
+                  }
+                  break;
+              }
+            },
+            itemBuilder: (context) {
+              final items = <PopupMenuEntry<_TractionMoreAction>>[];
+              if (hasClassActions) {
+                items.add(
+                  PopupMenuItem(
+                    value: _TractionMoreAction.classStats,
+                    child: Row(
+                      children: [
+                        Icon(
+                          _showClassStatsPanel ? Icons.check : Icons.check_box_outline_blank,
+                          size: 18,
+                        ),
+                        const SizedBox(width: 8),
+                        const Text('Class stats'),
+                      ],
+                    ),
+                  ),
+                );
+              }
+              if (hasClassActions) {
+                items.add(
+                  PopupMenuItem(
+                    value: _TractionMoreAction.classLeaderboard,
+                    child: Row(
+                      children: [
+                        Icon(
+                          _showClassLeaderboardPanel
+                              ? Icons.check
+                              : Icons.check_box_outline_blank,
+                          size: 18,
+                        ),
+                        const SizedBox(width: 8),
+                        const Text('Class leaderboard'),
+                      ],
+                    ),
+                  ),
+                );
+              }
+              if (items.isNotEmpty && hasAdminActions) {
+                items.add(const PopupMenuDivider());
+              }
+              if (hasAdminActions) {
+                items.add(
+                  PopupMenuItem(
+                    value: _TractionMoreAction.adminPending,
+                    child: Row(
+                      children: [
+                        const Text('Pending locos'),
+                        const Spacer(),
+                        if (pendingLabel != null)
+                          _countChip(context, pendingLabel),
+                      ],
+                    ),
+                  ),
+                );
+                items.add(
+                  const PopupMenuItem(
+                    value: _TractionMoreAction.adminPendingChanges,
+                    child: Text('Pending changes'),
+                  ),
+                );
+              }
+              return items;
+            },
+            child: IgnorePointer(
+              child: FilledButton.tonalIcon(
+                onPressed: () {},
+                icon: const Icon(Icons.more_horiz),
+                label: Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    const Text('More'),
+                    if (pendingLabel != null) ...[
+                      const SizedBox(width: 6),
+                      _countChip(context, pendingLabel),
+                    ],
+                  ],
+                ),
+              ),
+            ),
+          );
+
     final desktopActions = [
       refreshButton,
-      if (classStatsButton != null) classStatsButton,
+      newTractionButton,
-      if (classLeaderboardButton != null) classLeaderboardButton,
+      if (moreButton != null) moreButton,
-      if (newTractionButton != null) newTractionButton,
     ];
 
     final mobileActions = [
-      if (newTractionButton != null) newTractionButton,
+      if (moreButton != null) moreButton,
-      if (classStatsButton != null) classStatsButton,
+      newTractionButton,
-      if (classLeaderboardButton != null) classLeaderboardButton,
       refreshButton,
     ];
 
@@ -1054,6 +1209,12 @@ class _TractionPageState extends State<TractionPage> {
     if (widget.onSelect != null) {
       widget.onSelect!(loco);
     }
+    if (widget.selectionMode && widget.selectionSingle) {
+      if (mounted) {
+        context.pop(loco);
+      }
+      return;
+    }
     setState(() {
       if (_selectedKeys.contains(keyVal)) {
         _selectedKeys.remove(keyVal);
@@ -1063,6 +1224,150 @@ class _TractionPageState extends State<TractionPage> {
     });
   }
 
+  Future<void> _confirmReplacePending(LocoSummary replacement) async {
+    final pendingId = widget.replacementPendingLocoId;
+    if (pendingId == null) return;
+    final navContext = context;
+    final messenger = ScaffoldMessenger.of(navContext);
+    String rejectionReason = '';
+    final confirmed = await showDialog<bool>(
+      context: navContext,
+      builder: (dialogContext) {
+        return StatefulBuilder(
+          builder: (context, setState) {
+            final canSubmit = rejectionReason.trim().isNotEmpty;
+            return AlertDialog(
+              title: const Text('Replace pending loco?'),
+              content: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    'Replace pending loco with ${replacement.locoClass} ${replacement.number}?',
+                  ),
+                  const SizedBox(height: 12),
+                  TextField(
+                    autofocus: true,
+                    maxLines: 2,
+                    decoration: const InputDecoration(
+                      labelText: 'Rejection reason',
+                      hintText: 'Reason for replacing this loco',
+                    ),
+                    onChanged: (val) => setState(() {
+                      rejectionReason = val;
+                    }),
+                  ),
+                ],
+              ),
+              actions: [
+                TextButton(
+                  onPressed: () => Navigator.of(dialogContext).pop(false),
+                  child: const Text('Cancel'),
+                ),
+                FilledButton(
+                  onPressed:
+                      canSubmit ? () => Navigator.of(dialogContext).pop(true) : null,
+                  child: const Text('Replace'),
+                ),
+              ],
+            );
+          },
+        );
+      },
+    );
+    if (confirmed != true) return;
+    if (!navContext.mounted) return;
+    try {
+      final data = navContext.read<DataService>();
+      await data.rejectPendingLoco(
+            locoId: pendingId,
+            replacementLocoId: replacement.id,
+            rejectedReason: rejectionReason,
+          );
+      if (navContext.mounted) {
+        messenger.showSnackBar(
+          const SnackBar(content: Text('Pending loco replaced')),
+        );
+        navContext.pop();
+      }
+    } catch (e) {
+      if (navContext.mounted) {
+        messenger.showSnackBar(
+          SnackBar(content: Text('Failed to replace loco: $e')),
+        );
+      }
+    }
+  }
+
+  Future<void> _confirmTransfer(LocoSummary target) async {
+    final fromId = _transferFromLocoId;
+    if (fromId == null) return;
+    final navContext = context;
+    final messenger = ScaffoldMessenger.of(navContext);
+    final data = navContext.read<DataService>();
+    final fromLoco = data.traction.firstWhere(
+      (l) => l.id == fromId,
+      orElse: () => target,
+    );
+    final fromLabel = '${fromLoco.locoClass} ${fromLoco.number}'.trim();
+    final toLabel = '${target.locoClass} ${target.number}'.trim();
+    final confirmed = await showDialog<bool>(
+      context: navContext,
+      builder: (dialogContext) {
+        return AlertDialog(
+          title: const Text('Transfer allocations?'),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                'Transfer all allocations from $fromLabel to $toLabel?',
+              ),
+              const SizedBox(height: 12),
+              Text(
+                'From: $fromLabel',
+                style: Theme.of(dialogContext)
+                    .textTheme
+                    .bodyMedium
+                    ?.copyWith(fontWeight: FontWeight.w700),
+              ),
+              Text('To: $toLabel'),
+            ],
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.of(dialogContext).pop(false),
+              child: const Text('Cancel'),
+            ),
+            FilledButton(
+              onPressed: () => Navigator.of(dialogContext).pop(true),
+              child: const Text('Transfer'),
+            ),
+          ],
+        );
+      },
+    );
+    if (confirmed != true) return;
+    if (!navContext.mounted) return;
+    try {
+      final data = navContext.read<DataService>();
+      await data.transferAllocations(fromLocoId: fromId, toLocoId: target.id);
+      if (navContext.mounted) {
+        messenger.showSnackBar(
+          const SnackBar(content: Text('Allocations transferred')),
+        );
+      }
+      await _refreshTraction(preservePosition: true);
+      if (navContext.mounted) navContext.pop();
+    } catch (e) {
+      if (navContext.mounted) {
+        messenger.showSnackBar(
+          SnackBar(content: Text('Failed to transfer allocations: $e')),
+        );
+      }
+    }
+  }
+
   bool _isSelected(LocoSummary loco) {
     final keyVal = '${loco.locoClass}-${loco.number}';
     return _selectedKeys.contains(keyVal);
@@ -1086,6 +1391,69 @@ class _TractionPageState extends State<TractionPage> {
     );
   }
 
+  Widget? _buildTransferBanner(DataService data) {
+    final fromId = _transferFromLocoId;
+    if (fromId == null) return null;
+    if (_transferFromLabel == null || _transferFromLabel!.trim().isEmpty) {
+      final from = data.traction.firstWhere(
+        (loco) => loco.id == fromId,
+        orElse: () => LocoSummary(
+          locoId: fromId,
+          locoType: '',
+          locoNumber: '',
+          locoName: '',
+          locoClass: '',
+          locoOperator: '',
+        ),
+      );
+      final fallbackLabel = '${from.locoClass} ${from.number}'.trim().isEmpty
+          ? 'Loco $fromId'
+          : '${from.locoClass} ${from.number}'.trim();
+      _transferFromLabel = fallbackLabel;
+    }
+    final label = _transferFromLabel ?? 'Loco $fromId';
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: Colors.orange.withValues(alpha: 0.1),
+        borderRadius: BorderRadius.circular(8),
+        border: Border.all(color: Colors.orange.withValues(alpha: 0.4)),
+      ),
+      child: Row(
+        children: [
+          const Icon(Icons.swap_horiz, color: Colors.orange),
+          const SizedBox(width: 8),
+          Expanded(
+            child: Text(
+              'Transferring allocations from $label. Select a loco to transfer to.',
+              style: const TextStyle(fontWeight: FontWeight.w600),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _countChip(BuildContext context, String label) {
+    final scheme = Theme.of(context).colorScheme;
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+      decoration: BoxDecoration(
+        color: scheme.primary,
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Text(
+        label,
+        style: TextStyle(
+          color: scheme.onPrimary,
+          fontWeight: FontWeight.w700,
+          fontSize: 12,
+        ),
+      ),
+    );
+  }
+
   Widget _buildFilterInput(
     BuildContext context,
     EventField field,
@@ -1199,11 +1567,33 @@ class _TractionPageState extends State<TractionPage> {
                 loco: loco,
                 selectionMode: widget.selectionMode,
                 isSelected: _isSelected(loco),
-              onShowInfo: () => showTractionDetails(context, loco),
+                onShowInfo: () => showTractionDetails(
+                  context,
+                  loco,
+                  onActionComplete: () => _refreshTraction(preservePosition: true),
+                ),
                 onOpenTimeline: () => _openTimeline(loco),
                 onOpenLegs: () => _openLegs(loco),
-              onToggleSelect:
+                onActionComplete: _refreshTraction,
-                  widget.selectionMode ? () => _toggleSelection(loco) : null,
+                onToggleSelect: widget.selectionMode &&
+                        widget.replacementPendingLocoId == null &&
+                        (widget.transferFromLocoId == null ||
+                            widget.transferFromLocoId != loco.id)
+                    ? () => _toggleSelection(loco)
+                    : null,
+                onReplacePending: widget.selectionMode &&
+                        widget.selectionSingle &&
+                        widget.replacementPendingLocoId != null &&
+                        (widget.transferFromLocoId == null ||
+                            widget.transferFromLocoId != loco.id)
+                    ? () => _confirmReplacePending(loco)
+                    : null,
+                onTransferAllocations: widget.selectionMode &&
+                        widget.selectionSingle &&
+                        widget.transferFromLocoId != null &&
+                        widget.transferFromLocoId != loco.id
+                    ? () => _confirmTransfer(loco)
+                    : null,
               );
           }
 

lib/components/pages/traction/traction_pending_changes_page.dart

@@ -0,0 +1,152 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:mileograph_flutter/components/traction/traction_card.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/api_service.dart';
+import 'package:mileograph_flutter/services/authservice.dart';
+import 'package:provider/provider.dart';
+
+class TractionPendingChangesPage extends StatefulWidget {
+  const TractionPendingChangesPage({super.key});
+
+  @override
+  State<TractionPendingChangesPage> createState() =>
+      _TractionPendingChangesPageState();
+}
+
+class _TractionPendingChangesPageState extends State<TractionPendingChangesPage> {
+  bool _isLoading = false;
+  String? _error;
+  List<LocoSummary> _locos = const [];
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) => _load());
+  }
+
+  Future<void> _load() async {
+    setState(() {
+      _isLoading = true;
+      _error = null;
+    });
+    try {
+      final api = context.read<ApiService>();
+      final json = await api.get('/event/pending/locos');
+      if (json is List) {
+        setState(() {
+          _locos = json
+              .whereType<Map>()
+              .map((e) => LocoSummary.fromJson(
+                    e.map((k, v) => MapEntry(k.toString(), v)),
+                  ))
+              .toList();
+        });
+      } else {
+        setState(() {
+          _error = 'Unexpected response';
+          _locos = const [];
+        });
+      }
+    } catch (e) {
+      setState(() {
+        _error = e.toString();
+        _locos = const [];
+      });
+    } finally {
+      if (mounted) {
+        setState(() {
+          _isLoading = false;
+        });
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isElevated = context.select<AuthService, bool>((auth) => auth.isElevated);
+    return Scaffold(
+      appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () => Navigator.of(context).maybePop(),
+        ),
+        title: const Text('Pending changes'),
+      ),
+      body: isElevated
+          ? RefreshIndicator(
+              onRefresh: _load,
+              child: _buildBody(context),
+            )
+          : ListView(
+              padding: const EdgeInsets.all(16),
+              children: const [
+                Text('Admin access required.'),
+              ],
+            ),
+    );
+  }
+
+  Widget _buildBody(BuildContext context) {
+    if (_isLoading && _locos.isEmpty) {
+      return const Center(child: CircularProgressIndicator());
+    }
+    if (_error != null) {
+      return ListView(
+        padding: const EdgeInsets.all(16),
+        children: [
+          Text(
+            'Failed to load pending changes: $_error',
+            style: Theme.of(context)
+                .textTheme
+                .bodyMedium
+                ?.copyWith(color: Theme.of(context).colorScheme.error),
+          ),
+          const SizedBox(height: 12),
+          FilledButton.icon(
+            onPressed: _load,
+            icon: const Icon(Icons.refresh),
+            label: const Text('Retry'),
+          ),
+        ],
+      );
+    }
+    if (_locos.isEmpty) {
+      return ListView(
+        padding: const EdgeInsets.all(16),
+        children: const [
+          Text('No pending changes found.'),
+        ],
+      );
+    }
+    return ListView.builder(
+      padding: const EdgeInsets.all(12),
+      itemCount: _locos.length,
+      itemBuilder: (context, index) {
+        final loco = _locos[index];
+        return Padding(
+          padding: const EdgeInsets.symmetric(vertical: 6.0),
+          child: TractionCard(
+            loco: loco,
+            selectionMode: false,
+            isSelected: false,
+            onShowInfo: () => showTractionDetails(
+              context,
+              loco,
+              onActionComplete: _load,
+            ),
+            onOpenTimeline: () => context.push(
+              '/traction/${loco.id}/timeline',
+              extra: {
+                'label': '${loco.locoClass} ${loco.number}'.trim(),
+                'showPending': true,
+              },
+            ),
+            onOpenLegs: () => context.push('/traction/${loco.id}/legs'),
+            onActionComplete: _load,
+          ),
+        );
+      },
+    );
+  }
+}

lib/components/pages/traction/traction_pending_page.dart

@@ -0,0 +1,140 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:mileograph_flutter/components/traction/traction_card.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/api_service.dart';
+import 'package:provider/provider.dart';
+
+class TractionPendingPage extends StatefulWidget {
+  const TractionPendingPage({super.key});
+
+  @override
+  State<TractionPendingPage> createState() => _TractionPendingPageState();
+}
+
+class _TractionPendingPageState extends State<TractionPendingPage> {
+  bool _isLoading = false;
+  String? _error;
+  List<LocoSummary> _locos = const [];
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) => _load());
+  }
+
+  Future<void> _load() async {
+    setState(() {
+      _isLoading = true;
+      _error = null;
+    });
+    try {
+      final api = context.read<ApiService>();
+      final params = '?limit=200&offset=0';
+      final json = await api.get('/loco/pending$params');
+      if (json is List) {
+        setState(() {
+          _locos = json
+              .whereType<Map>()
+              .map((e) => LocoSummary.fromJson(
+                    e.map((k, v) => MapEntry(k.toString(), v)),
+                  ))
+              .toList();
+        });
+      } else {
+        setState(() {
+          _error = 'Unexpected response';
+          _locos = const [];
+        });
+      }
+    } catch (e) {
+      setState(() {
+        _error = e.toString();
+        _locos = const [];
+      });
+    } finally {
+      if (mounted) {
+        setState(() {
+          _isLoading = false;
+        });
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () => Navigator.of(context).maybePop(),
+        ),
+        title: const Text('Pending traction'),
+      ),
+      body: RefreshIndicator(
+        onRefresh: _load,
+        child: _buildBody(context),
+      ),
+    );
+  }
+
+  Widget _buildBody(BuildContext context) {
+    if (_isLoading && _locos.isEmpty) {
+      return const Center(child: CircularProgressIndicator());
+    }
+    if (_error != null) {
+      return ListView(
+        padding: const EdgeInsets.all(16),
+        children: [
+          Text(
+            'Failed to load pending traction: $_error',
+            style: Theme.of(context)
+                .textTheme
+                .bodyMedium
+                ?.copyWith(color: Theme.of(context).colorScheme.error),
+          ),
+          const SizedBox(height: 12),
+          FilledButton.icon(
+            onPressed: _load,
+            icon: const Icon(Icons.refresh),
+            label: const Text('Retry'),
+          ),
+        ],
+      );
+    }
+    if (_locos.isEmpty) {
+      return ListView(
+        padding: const EdgeInsets.all(16),
+        children: const [
+          Text('No pending traction found.'),
+        ],
+      );
+    }
+    return ListView.builder(
+      padding: const EdgeInsets.all(12),
+      itemCount: _locos.length,
+      itemBuilder: (context, index) {
+        final loco = _locos[index];
+        return Padding(
+          padding: const EdgeInsets.symmetric(vertical: 6.0),
+          child: TractionCard(
+            loco: loco,
+            selectionMode: false,
+            isSelected: false,
+            onShowInfo: () => showTractionDetails(
+              context,
+              loco,
+              onActionComplete: _load,
+            ),
+            onOpenTimeline: () => context.push(
+              '/traction/${loco.id}/timeline',
+              extra: {'label': '${loco.locoClass} ${loco.number}'.trim()},
+            ),
+            onOpenLegs: () => context.push('/traction/${loco.id}/legs'),
+            onActionComplete: _load,
+          ),
+        );
+      },
+    );
+  }
+}

lib/components/traction/traction_card.dart

@@ -1,6 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:intl/intl.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/api_service.dart';
+import 'package:mileograph_flutter/services/authservice.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';
 
@@ -14,6 +18,9 @@ class TractionCard extends StatelessWidget {
     required this.onOpenTimeline,
     this.onOpenLegs,
     this.onToggleSelect,
+    this.onReplacePending,
+    this.onActionComplete,
+    this.onTransferAllocations,
   });
 
   final LocoSummary loco;
@@ -23,12 +30,20 @@ class TractionCard extends StatelessWidget {
   final VoidCallback onOpenTimeline;
   final VoidCallback? onOpenLegs;
   final VoidCallback? onToggleSelect;
+  final VoidCallback? onReplacePending;
+  final Future<void> Function()? onActionComplete;
+  final VoidCallback? onTransferAllocations;
 
   @override
   Widget build(BuildContext context) {
     final status = loco.status ?? 'Unknown';
     final operatorName = loco.operator ?? '';
     final domain = loco.domain ?? '';
+    final isVisibilityPending =
+        (loco.visibility ?? '').toLowerCase().trim() == 'pending';
+    final isRejected =
+        (loco.visibility ?? '').toLowerCase().contains('reject');
+    final isElevated = context.read<AuthService>().isElevated;
     final hasMileageOrTrips = _hasMileageOrTrips(loco);
     final statusColors = _statusChipColors(context, status);
     final distanceUnits = context.watch<DistanceUnitService>();
@@ -45,23 +60,14 @@ class TractionCard extends StatelessWidget {
                 Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    Row(
+                    _LocoNumberWithHistory(
-                      children: [
+                      number: loco.number,
-                        Text(
+                      matchedNumber: loco.matchedNumber,
-                          loco.number,
+                      matchedNumberValidTo: loco.matchedNumberValidTo,
-                          style: Theme.of(context).textTheme.headlineSmall
+                      hasMileageOrTrips: hasMileageOrTrips,
-                              ?.copyWith(fontWeight: FontWeight.w800),
+                      largeStyle: Theme.of(context).textTheme.headlineSmall,
-                        ),
+                      showPendingChip: isVisibilityPending,
-                        if (hasMileageOrTrips)
+                      showRejectedChip: isRejected && !isVisibilityPending,
-                          Padding(
-                            padding: const EdgeInsets.only(left: 6.0),
-                            child: Icon(
-                              Icons.check_circle,
-                              size: 18,
-                              color: Colors.green.shade600,
-                            ),
-                          ),
-                      ],
                     ),
                     Text(
                       loco.locoClass,
@@ -78,6 +84,36 @@ class TractionCard extends StatelessWidget {
                       ),
                   ],
                 ),
+                Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    if (isElevated && isVisibilityPending) ...[
+                    PopupMenuButton<_PendingLocoAction>(
+                      tooltip: 'Pending options',
+                      onSelected: (action) => _handlePendingAction(
+                        context,
+                        action,
+                        loco,
+                        onActionComplete: onActionComplete,
+                      ),
+                      itemBuilder: (context) => const [
+                        PopupMenuItem(
+                          value: _PendingLocoAction.accept,
+                          child: Text('Accept loco'),
+                        ),
+                        PopupMenuItem(
+                          value: _PendingLocoAction.reject,
+                          child: Text('Reject loco'),
+                        ),
+                        PopupMenuItem(
+                          value: _PendingLocoAction.replace,
+                          child: Text('Replace...'),
+                        ),
+                      ],
+                      icon: const Icon(Icons.more_vert),
+                    ),
+                      const SizedBox(width: 6),
+                    ],
                     Chip(
                       label: Text(status),
                       backgroundColor: statusColors.$1,
@@ -85,6 +121,8 @@ class TractionCard extends StatelessWidget {
                     ),
                   ],
                 ),
+              ],
+            ),
             const SizedBox(height: 8),
             LayoutBuilder(
               builder: (context, constraints) {
@@ -108,7 +146,20 @@ class TractionCard extends StatelessWidget {
                     ),
                 ];
 
-                final addButton = selectionMode && onToggleSelect != null
+                // Prefer replace action when picking a replacement loco.
+                final addButton = onTransferAllocations != null
+                    ? TextButton.icon(
+                        onPressed: onTransferAllocations,
+                        icon: const Icon(Icons.swap_horiz),
+                        label: const Text('Transfer'),
+                      )
+                    : onReplacePending != null
+                        ? TextButton.icon(
+                            onPressed: onReplacePending,
+                            icon: const Icon(Icons.swap_horiz),
+                            label: const Text('Replace'),
+                          )
+                        : (!isRejected && selectionMode && onToggleSelect != null)
                             ? TextButton.icon(
                                 onPressed: onToggleSelect,
                                 icon: Icon(
@@ -116,7 +167,8 @@ class TractionCard extends StatelessWidget {
                                       ? Icons.remove_circle_outline
                                       : Icons.add_circle_outline,
                                 ),
-                        label: Text(isSelected ? 'Remove' : 'Add to entry'),
+                                label:
+                                    Text(isSelected ? 'Remove' : 'Add to entry'),
                               )
                             : null;
 
@@ -205,13 +257,327 @@ class TractionCard extends StatelessWidget {
   }
 }
 
+class _LocoNumberWithHistory extends StatelessWidget {
+  const _LocoNumberWithHistory({
+    required this.number,
+    required this.matchedNumber,
+    required this.matchedNumberValidTo,
+    required this.hasMileageOrTrips,
+    this.largeStyle,
+    this.showPendingChip = false,
+    this.showRejectedChip = false,
+  });
+
+  final String number;
+  final String? matchedNumber;
+  final DateTime? matchedNumberValidTo;
+  final bool hasMileageOrTrips;
+  final TextStyle? largeStyle;
+  final bool showPendingChip;
+  final bool showRejectedChip;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final historicNumber = matchedNumber?.trim() ?? '';
+    final hasHistoricDate = matchedNumberValidTo != null;
+    final showHistoric = historicNumber.isNotEmpty && hasHistoricDate;
+    final historicDate =
+        hasHistoricDate ? DateFormat('yyyy-MM-dd').format(matchedNumberValidTo!) : null;
+
+    return Row(
+      children: [
+        Text(
+          number,
+          style: (largeStyle ?? theme.textTheme.titleLarge)?.copyWith(
+            fontWeight: FontWeight.w800,
+          ),
+        ),
+        if (hasMileageOrTrips)
+          Padding(
+            padding: const EdgeInsets.only(left: 6.0),
+            child: Icon(
+              Icons.check_circle,
+              size: 18,
+              color: Colors.green.shade600,
+            ),
+          ),
+        if (showPendingChip) ...[
+          const SizedBox(width: 8),
+          Container(
+            padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+            decoration: BoxDecoration(
+              color: theme.colorScheme.surfaceContainerHighest,
+              borderRadius: BorderRadius.circular(8),
+            ),
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                const Icon(Icons.pending, size: 14),
+                const SizedBox(width: 4),
+                Text(
+                  'Pending',
+                  style: theme.textTheme.labelSmall
+                      ?.copyWith(fontWeight: FontWeight.w700),
+                ),
+              ],
+            ),
+          ),
+        ],
+        if (showRejectedChip) ...[
+          const SizedBox(width: 8),
+          Container(
+            padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+            decoration: BoxDecoration(
+              color: Colors.red.shade700,
+              borderRadius: BorderRadius.circular(8),
+            ),
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                const Icon(Icons.close, size: 14, color: Colors.white),
+                const SizedBox(width: 4),
+                Text(
+                  'Rejected',
+                  style: theme.textTheme.labelSmall?.copyWith(
+                    fontWeight: FontWeight.w700,
+                    color: Colors.white,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ],
+        if (showHistoric) ...[
+          const SizedBox(width: 8),
+          Text(
+            historicNumber,
+            style: theme.textTheme.labelMedium?.copyWith(
+              fontWeight: FontWeight.w800,
+              color: theme.colorScheme.onSurfaceVariant,
+            ),
+          ),
+          if (historicDate != null) ...[
+            const SizedBox(width: 6),
+            Text(
+              'until $historicDate',
+              style: theme.textTheme.labelSmall?.copyWith(
+                color: theme.colorScheme.onSurfaceVariant,
+              ),
+            ),
+          ],
+        ],
+      ],
+    );
+  }
+}
+
+enum _PendingLocoAction { accept, reject, replace }
+
+Future<void> _handlePendingAction(
+  BuildContext context,
+  _PendingLocoAction action,
+  LocoSummary loco, {
+  Future<void> Function()? onActionComplete,
+}) async {
+  final navContext = context;
+  final messenger = ScaffoldMessenger.of(navContext);
+  final data = navContext.read<DataService>();
+  if (action == _PendingLocoAction.replace) {
+    final path = Uri(
+      path: '/traction',
+      queryParameters: {
+        'selection': 'single',
+        'replacementPendingLocoId': loco.id.toString(),
+      },
+    ).toString();
+    final selected = await navContext.push<LocoSummary>(
+      path,
+      extra: {
+        'selection': 'single',
+        'replacementPendingLocoId': loco.id,
+      },
+    );
+    if (!navContext.mounted) return;
+    if (selected == null) return;
+    String rejectionReason = '';
+    final confirmed = await showDialog<bool>(
+      context: navContext,
+      builder: (dialogContext) {
+        return StatefulBuilder(
+          builder: (context, setState) {
+            final canSubmit = rejectionReason.trim().isNotEmpty;
+            return AlertDialog(
+              title: const Text('Replace pending loco?'),
+              content: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    'Replace ${loco.locoClass} ${loco.number} with ${selected.locoClass} ${selected.number}?',
+                  ),
+                  const SizedBox(height: 12),
+                  TextField(
+                    autofocus: true,
+                    maxLines: 2,
+                    decoration: const InputDecoration(
+                      labelText: 'Rejection reason',
+                      hintText: 'Reason for replacing this loco',
+                    ),
+                    onChanged: (val) => setState(() {
+                      rejectionReason = val;
+                    }),
+                  ),
+                ],
+              ),
+              actions: [
+                TextButton(
+                  onPressed: () => Navigator.of(dialogContext).pop(false),
+                  child: const Text('Cancel'),
+                ),
+                FilledButton(
+                  onPressed: canSubmit
+                      ? () => Navigator.of(dialogContext).pop(true)
+                      : null,
+                  child: const Text('Replace'),
+                ),
+              ],
+            );
+          },
+        );
+      },
+    );
+    if (!navContext.mounted) return;
+    if (confirmed != true) return;
+    try {
+      await data.rejectPendingLoco(
+        locoId: loco.id,
+        replacementLocoId: selected.id,
+        rejectedReason: rejectionReason,
+      );
+      await data.fetchClassList(force: true);
+      if (navContext.mounted) {
+        messenger.showSnackBar(
+          const SnackBar(content: Text('Pending loco replaced')),
+        );
+      }
+      await onActionComplete?.call();
+    } catch (e) {
+      messenger.showSnackBar(
+        SnackBar(content: Text('Failed to replace loco: $e')),
+      );
+    }
+    return;
+  }
+  if (action == _PendingLocoAction.reject) {
+    String rejectionReason = '';
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (dialogContext) {
+        return StatefulBuilder(
+          builder: (context, setState) {
+            final canSubmit = rejectionReason.trim().isNotEmpty;
+            return AlertDialog(
+              title: const Text('Reject loco?'),
+              content: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  TextField(
+                    autofocus: true,
+                    maxLines: 2,
+                    decoration: const InputDecoration(
+                      labelText: 'Rejection reason',
+                      hintText: 'Why is this loco being rejected?',
+                    ),
+                    onChanged: (val) => setState(() {
+                      rejectionReason = val;
+                    }),
+                  ),
+                ],
+              ),
+              actions: [
+                TextButton(
+                  onPressed: () => Navigator.of(context).pop(false),
+                  child: const Text('Cancel'),
+                ),
+                FilledButton(
+                  onPressed: canSubmit
+                      ? () => Navigator.of(context).pop(true)
+                      : null,
+                  child: const Text('Reject'),
+                ),
+              ],
+            );
+          },
+        );
+      },
+    );
+    if (confirmed != true) return;
+
+    if (!navContext.mounted) return;
+    try {
+      await data.rejectPendingLoco(
+        locoId: loco.id,
+        rejectedReason: rejectionReason,
+      );
+      await data.fetchClassList(force: true);
+      if (navContext.mounted) {
+        messenger.showSnackBar(
+          const SnackBar(content: Text('Pending loco rejected')),
+        );
+      }
+      await onActionComplete?.call();
+    } catch (e) {
+      if (navContext.mounted) {
+        messenger.showSnackBar(
+          SnackBar(content: Text('Failed to reject loco: $e')),
+        );
+      }
+    }
+    return;
+  }
+
+  try {
+    await data.acceptPendingLoco(locoId: loco.id);
+    if (navContext.mounted) {
+      messenger.showSnackBar(
+        const SnackBar(content: Text('Pending loco accepted')),
+      );
+    }
+    await onActionComplete?.call();
+  } catch (e) {
+    if (navContext.mounted) {
+      messenger.showSnackBar(
+        SnackBar(content: Text('Failed to accept loco: $e')),
+      );
+    }
+  }
+}
+
 Future<void> showTractionDetails(
   BuildContext context,
-  LocoSummary loco,
+  LocoSummary loco, {
-) async {
+  Future<void> Function()? onActionComplete,
+}) async {
+  final navContext = context;
   final hasMileageOrTrips = _hasMileageOrTrips(loco);
+  final isVisibilityPending =
+      (loco.visibility ?? '').toLowerCase().trim() == 'pending';
+  final isRejected =
+      (loco.visibility ?? '').toLowerCase().contains('reject');
+  final rejectedReason =
+      loco.extra['rejected_reason']?.toString().trim() ?? '';
   final distanceUnits = context.read<DistanceUnitService>();
   final api = context.read<ApiService>();
+  final data = context.read<DataService>();
+  final auth = context.read<AuthService>();
+  final messenger = ScaffoldMessenger.of(context);
+  final userId = auth.userId;
+  final createdBy = loco.extra['created_by']?.toString();
+  final isOwnedByUser =
+      userId != null && createdBy != null && createdBy == userId;
+  final canDeleteAsOwner = isOwnedByUser && (isVisibilityPending || isRejected);
   final leaderboardId = _leaderboardId(loco);
   final leaderboardFuture = leaderboardId == null
       ? Future.value(const <LeaderboardEntry>[])
@@ -240,23 +606,13 @@ Future<void> showTractionDetails(
                     Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-                        Row(
+                        _LocoNumberWithHistory(
-                          children: [
+                          number: loco.number,
-                            Text(
+                          matchedNumber: loco.matchedNumber,
-                              loco.number,
+                          matchedNumberValidTo: loco.matchedNumberValidTo,
-                              style: Theme.of(context).textTheme.titleLarge
+                          hasMileageOrTrips: hasMileageOrTrips,
-                                  ?.copyWith(fontWeight: FontWeight.w800),
+                          showPendingChip: isVisibilityPending,
-                            ),
+                          showRejectedChip: isRejected && !isVisibilityPending,
-                            if (hasMileageOrTrips)
-                              Padding(
-                                padding: const EdgeInsets.only(left: 6.0),
-                                child: Icon(
-                                  Icons.check_circle,
-                                  size: 18,
-                                  color: Colors.green.shade600,
-                                ),
-                              ),
-                          ],
                         ),
                         Text(
                           loco.locoClass,
@@ -279,6 +635,15 @@ Future<void> showTractionDetails(
                 child: ListView(
                   controller: controller,
                   children: [
+                    if (isRejected && rejectedReason.isNotEmpty)
+                      ...[
+                        _detailRow(
+                          context,
+                          'Rejection reason',
+                            rejectedReason,
+                          ),
+                          const Divider(),
+                        ],
                       _detailRow(context, 'Status', loco.status ?? 'Unknown'),
                       _detailRow(context, 'Operator', loco.operator ?? ''),
                       _detailRow(context, 'Domain', loco.domain ?? ''),
@@ -358,6 +723,97 @@ Future<void> showTractionDetails(
                       );
                     },
                   ),
+                  const SizedBox(height: 16),
+                  FilledButton.icon(
+                    onPressed: () {
+                      Navigator.of(ctx).pop();
+                      final transferLabel = '${loco.locoClass} ${loco.number}'.trim();
+                      navContext.push(
+                        Uri(
+                          path: '/traction',
+                          queryParameters: {
+                            'selection': 'single',
+                            'transferFromLocoId': loco.id.toString(),
+                            'transferFromLabel': transferLabel,
+                          },
+                        ).toString(),
+                        extra: {
+                          'selection': 'single',
+                          'transferFromLocoId': loco.id,
+                          'transferFromLabel': transferLabel,
+                        },
+                      );
+                    },
+                    icon: const Icon(Icons.swap_horiz),
+                    label: const Text('Transfer allocations'),
+                  ),
+                  if (auth.isElevated || canDeleteAsOwner) ...[
+                    const SizedBox(height: 8),
+                    ExpansionTile(
+                      tilePadding: EdgeInsets.zero,
+                      childrenPadding: EdgeInsets.zero,
+                      title: Text(
+                        'More',
+                        style: Theme.of(context).textTheme.titleSmall,
+                      ),
+                      children: [
+                        FilledButton.tonal(
+                          style: FilledButton.styleFrom(
+                            backgroundColor:
+                                Theme.of(context).colorScheme.errorContainer,
+                            foregroundColor:
+                                Theme.of(context).colorScheme.onErrorContainer,
+                          ),
+                          onPressed: () async {
+                            final confirmed = await showDialog<bool>(
+                              context: context,
+                              builder: (context) {
+                                return AlertDialog(
+                                  title: const Text('Delete loco?'),
+                                  content: const Text(
+                                    'This will permanently delete this loco. Are you sure?',
+                                  ),
+                                  actions: [
+                                    TextButton(
+                                      onPressed: () =>
+                                          Navigator.of(context).pop(false),
+                                      child: const Text('Cancel'),
+                                    ),
+                                    FilledButton(
+                                      onPressed: () =>
+                                          Navigator.of(context).pop(true),
+                                      style: FilledButton.styleFrom(
+                                        backgroundColor:
+                                            Theme.of(context).colorScheme.error,
+                                      ),
+                                      child: const Text('Delete'),
+                                    ),
+                                  ],
+                                );
+                              },
+                            );
+                            if (confirmed != true) return;
+                            try {
+                              await data.adminDeleteLoco(locoId: loco.id);
+                              messenger.showSnackBar(
+                                const SnackBar(content: Text('Loco deleted')),
+                              );
+                              await onActionComplete?.call();
+                              if (!context.mounted) return;
+                              Navigator.of(ctx).pop();
+                            } catch (e) {
+                              messenger.showSnackBar(
+                                SnackBar(
+                                    content: Text('Failed to delete loco: $e')),
+                              );
+                            }
+                          },
+                          child: const Text('Delete loco'),
+                        ),
+                        const SizedBox(height: 8),
+                      ],
+                    ),
+                  ],
                 ],
               ),
             ),

lib/components/widgets/leg_share_edit_notification_card.dart

@@ -19,6 +19,8 @@ class _LegShareEditNotificationCardState extends State<LegShareEditNotificationC
   int? _legId;
   int? _shareId;
   Leg? _currentLeg;
+  LegShareData? _share;
+  Future<LegShareData?>? _shareFuture;
   bool _loading = false;
 
   static const int _summaryLimit = 3;
@@ -33,11 +35,11 @@ class _LegShareEditNotificationCardState extends State<LegShareEditNotificationC
   void didUpdateWidget(covariant LegShareEditNotificationCard oldWidget) {
     super.didUpdateWidget(oldWidget);
     if (oldWidget.notification != widget.notification) {
-      _parseNotification();
+      _parseNotification(notify: true);
     }
   }
 
-  void _parseNotification() {
+  void _parseNotification({bool notify = false}) {
     final rawBody = widget.notification.body.trim();
 
     // Reset
@@ -45,11 +47,14 @@ class _LegShareEditNotificationCardState extends State<LegShareEditNotificationC
     _legId = null;
     _currentLeg = null;
     _changes = null;
+    _share = null;
+    _shareFuture = null;
 
     final parsed = _decodeBody(rawBody);
     if (parsed != null) {
       _shareId = _parseInt(parsed['share_id']);
       _legId = _parseInt(parsed['leg_id']);
+      _currentLeg = _findCurrentLeg(_legId);
       final accepted = _asStringKeyedMap(parsed['accepted_changes']);
       if (accepted != null) {
         _changes = accepted;
@@ -58,6 +63,10 @@ class _LegShareEditNotificationCardState extends State<LegShareEditNotificationC
 
     // Fallback: extract share_id from raw string if still missing.
     _shareId ??= _extractShareId(rawBody);
+    _prepareShareFuture();
+    if (notify) {
+      setState(() {});
+    }
   }
 
   int? _parseInt(dynamic value) {
@@ -160,6 +169,26 @@ class _LegShareEditNotificationCardState extends State<LegShareEditNotificationC
       _legId = share?.entry.id;
       _currentLeg ??= _findCurrentLeg(_legId);
     } catch (e) {
+      // ignore: avoid_empty_catches
+    }
+  }
+
+  void _prepareShareFuture() {
+    if (_shareId == null) return;
+    _shareFuture = context.read<DataService>().fetchLegShare(_shareId!.toString());
+  }
+
+  Future<void> _loadShareIfNeeded() async {
+    if (_share != null) return;
+    if (_shareId == null) return;
+    try {
+      final future = _shareFuture ??
+          context.read<DataService>().fetchLegShare(_shareId!.toString());
+      final share = await future;
+      if (!mounted) return;
+      _share = share;
+    } catch (e) {
+      // ignore: avoid_empty_catches
     }
   }
 
@@ -173,6 +202,79 @@ class _LegShareEditNotificationCardState extends State<LegShareEditNotificationC
     }
   }
 
+  String _formatDateTime(DateTime dateTime) {
+    return '${dateTime.year.toString().padLeft(4, '0')}-'
+        '${dateTime.month.toString().padLeft(2, '0')}-'
+        '${dateTime.day.toString().padLeft(2, '0')} '
+        '${dateTime.hour.toString().padLeft(2, '0')}:'
+        '${dateTime.minute.toString().padLeft(2, '0')}';
+  }
+
+  Widget _buildLegSummary(BuildContext context) {
+    final future = _shareFuture;
+    if (future == null) {
+      final leg = _currentLeg;
+      return leg == null ? const SizedBox.shrink() : _legSummaryRow(context, leg);
+    }
+
+    return FutureBuilder<LegShareData?>(
+      future: future,
+      builder: (context, snapshot) {
+        final share = snapshot.data;
+        if (share != null) {
+          _share = share;
+        }
+        final leg = share?.entry ?? _currentLeg;
+        if (leg == null) {
+          return const SizedBox.shrink();
+        }
+        return _legSummaryRow(context, leg);
+      },
+    );
+  }
+
+  Widget _legSummaryRow(BuildContext context, Leg leg) {
+    final start = leg.route.isNotEmpty ? leg.route.first : leg.start;
+    final end = leg.route.isNotEmpty ? leg.route.last : leg.end;
+    return Text('${_formatDateTime(leg.beginTime)} • $start → $end');
+  }
+
+  String _asString(dynamic value) {
+    if (value == null) return '';
+    return value.toString();
+  }
+
+  Loco? _resolveLocoById(int locoId, {Leg? shareLeg}) {
+    for (final loco in shareLeg?.locos ?? const <Loco>[]) {
+      if (loco.id == locoId) return loco;
+    }
+    for (final loco in _currentLeg?.locos ?? const <Loco>[]) {
+      if (loco.id == locoId) return loco;
+    }
+    for (final loco in context.read<DataService>().traction) {
+      if (loco.id == locoId) return loco;
+    }
+    return null;
+  }
+
+  String _locoDisplayName(Map<String, dynamic> loco, {Leg? shareLeg}) {
+    final locoId = _parseInt(loco['loco_id']);
+    var locoClass = _asString(loco['class'] ?? loco['loco_class']);
+    var number = _asString(loco['number'] ?? loco['loco_number']);
+    if ((locoClass.isEmpty || number.isEmpty) && locoId != null) {
+      final resolved = _resolveLocoById(locoId, shareLeg: shareLeg);
+      if (resolved != null) {
+        if (locoClass.isEmpty) locoClass = resolved.locoClass;
+        if (number.isEmpty) number = resolved.number;
+      }
+    }
+    final parts = <String>[];
+    if (locoClass.isNotEmpty) parts.add(locoClass);
+    if (number.isNotEmpty) parts.add(number);
+    if (parts.isNotEmpty) return parts.join(' ');
+    return 'Loco ${locoId ?? '?'}';
+  }
+
 
   @override
   Widget build(BuildContext context) {
@@ -183,10 +285,14 @@ class _LegShareEditNotificationCardState extends State<LegShareEditNotificationC
     final entries = changes.entries.toList();
     final shown = entries.take(_summaryLimit).toList();
     final remaining = entries.length - shown.length;
+    final legSummary = _buildLegSummary(context);
+    final hasSummary = _shareFuture != null || _currentLeg != null;
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
+        if (hasSummary) legSummary,
+        if (hasSummary) const SizedBox(height: 8),
         ...shown.map((e) => _changePreview(context, e)),
         if (remaining > 0)
           Padding(
@@ -324,6 +430,7 @@ class _LegShareEditNotificationCardState extends State<LegShareEditNotificationC
   Future<void> _openDrawer(Map<String, dynamic> changes) async {
     setState(() => _loading = true);
     await _loadLegIdIfNeeded();
+    await _loadShareIfNeeded();
     _currentLeg ??= _findCurrentLeg(_legId);
     if (!mounted) return;
     setState(() => _loading = false);
@@ -397,7 +504,9 @@ class _LegShareEditNotificationCardState extends State<LegShareEditNotificationC
                             (loco['alloc_powering'] == 1 || loco['alloc_powering'] == true)
                                 ? Theme.of(context).colorScheme.primary.withValues(alpha: 0.12)
                                 : Theme.of(context).colorScheme.surfaceContainerHighest,
-                        label: Text('Loco ${loco['loco_id'] ?? '?'} (pos ${loco['alloc_pos'] ?? '?'}'),
+                        label: Text(
+                          '${_locoDisplayName(loco, shareLeg: _share?.entry)} (pos ${loco['alloc_pos'] ?? '?'})',
+                        ),
                         avatar: Icon(
                           Icons.train,
                           size: 16,

lib/components/widgets/leg_share_notification_card.dart

@@ -7,15 +7,23 @@ import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:provider/provider.dart';
 
-class LegShareNotificationCard extends StatelessWidget {
+class LegShareNotificationCard extends StatefulWidget {
   const LegShareNotificationCard({super.key, required this.notification});
 
   final UserNotification notification;
 
+  @override
+  State<LegShareNotificationCard> createState() => _LegShareNotificationCardState();
+}
+
+class _LegShareNotificationCardState extends State<LegShareNotificationCard> {
+  bool _accepting = false;
+  bool _rejecting = false;
+
   @override
   Widget build(BuildContext context) {
     final data = context.read<DataService>();
-    final legShareId = _extractLegShareId(notification.body);
+    final legShareId = _extractLegShareId(widget.notification.body);
     if (legShareId == null) {
       return const Text('Invalid leg share notification.');
     }
@@ -78,16 +86,28 @@ class LegShareNotificationCard extends StatelessWidget {
               runSpacing: 8,
               children: [
                 ElevatedButton(
-                  onPressed: () => _accept(context, share),
+                  onPressed: _accepting ? null : () => _accept(context, share),
-                  child: const Text('Accept'),
+                  child: _accepting
+                      ? const SizedBox(
+                          height: 18,
+                          width: 18,
+                          child: CircularProgressIndicator(strokeWidth: 2),
+                        )
+                      : const Text('Accept'),
                 ),
                 OutlinedButton(
                   onPressed: () => _inspect(context, share),
                   child: const Text('Inspect'),
                 ),
                 TextButton(
-                  onPressed: () => _reject(context, share),
+                  onPressed: _rejecting ? null : () => _reject(context, share),
-                  child: const Text('Reject'),
+                  child: _rejecting
+                      ? const SizedBox(
+                          height: 18,
+                          width: 18,
+                          child: CircularProgressIndicator(strokeWidth: 2),
+                        )
+                      : const Text('Reject'),
                 ),
               ],
             ),
@@ -98,12 +118,13 @@ class LegShareNotificationCard extends StatelessWidget {
   }
 
   Future<void> _accept(BuildContext context, LegShareData share) async {
+    setState(() => _accepting = true);
     final data = context.read<DataService>();
     final messenger = ScaffoldMessenger.maybeOf(context);
     try {
       await data.acceptLegShare(share);
       if (!context.mounted) return;
-      await data.dismissNotifications([notification.id]);
+      await data.dismissNotifications([widget.notification.id]);
       // Refresh legs in the background.
       unawaited(data.refreshLegs());
       messenger?.showSnackBar(
@@ -113,16 +134,21 @@ class LegShareNotificationCard extends StatelessWidget {
       messenger?.showSnackBar(
         SnackBar(content: Text('Failed to add shared entry: $e')),
       );
+    } finally {
+      if (mounted) {
+        setState(() => _accepting = false);
+      }
     }
   }
 
   Future<void> _reject(BuildContext context, LegShareData share) async {
+    setState(() => _rejecting = true);
     final data = context.read<DataService>();
     final messenger = ScaffoldMessenger.maybeOf(context);
     try {
       await data.rejectLegShare(share.id);
       if (!context.mounted) return;
-      await data.dismissNotifications([notification.id]);
+      await data.dismissNotifications([widget.notification.id]);
       messenger?.showSnackBar(
         const SnackBar(content: Text('Share rejected')),
       );
@@ -130,6 +156,10 @@ class LegShareNotificationCard extends StatelessWidget {
       messenger?.showSnackBar(
         SnackBar(content: Text('Failed to reject share: $e')),
       );
+    } finally {
+      if (mounted) {
+        setState(() => _rejecting = false);
+      }
     }
   }
 
@@ -140,7 +170,7 @@ class LegShareNotificationCard extends StatelessWidget {
       Navigator.of(context).pop();
     }
     await Future<void>.delayed(Duration.zero);
-    final target = share.copyWith(notificationId: notification.id);
+    final target = share.copyWith(notificationId: widget.notification.id);
     final ts = DateTime.now().millisecondsSinceEpoch;
     final path = '/add?share=${Uri.encodeComponent(share.id)}&ts=$ts';
     router.go(path, extra: target);

lib/objects/objects.dart

@@ -753,6 +753,9 @@ class LocoSummary extends Loco {
   final String? owner;
   final String? livery;
   final String? location;
+  final String? visibility;
+  final String? matchedNumber;
+  final DateTime? matchedNumberValidTo;
   final Map<String, dynamic> extra;
 
   LocoSummary({
@@ -772,6 +775,9 @@ class LocoSummary extends Loco {
     this.owner,
     this.livery,
     this.location,
+    this.visibility,
+    this.matchedNumber,
+    this.matchedNumberValidTo,
     Map<String, dynamic>? extra,
     super.powering = true,
     super.allocPos = 0,
@@ -808,6 +814,9 @@ class LocoSummary extends Loco {
     owner: json['owner'] ?? json['loco_owner'],
     livery: json['livery'],
     location: json['location'],
+    visibility: json['visibility']?.toString(),
+    matchedNumber: json['matched_number']?.toString(),
+    matchedNumberValidTo: _asNullableDateTime(json['matched_number_valid_to']),
     extra: Map<String, dynamic>.from(json),
     powering: _asBool(json['alloc_powering'] ?? json['powering'], true),
     allocPos: _asInt(json['alloc_pos'], 0),
@@ -835,6 +844,8 @@ class LocoAttrVersion {
   final String? precisionLevel;
   final String? maskedValidFrom;
   final dynamic valueNorm;
+  final bool isPending;
+  final bool canModeratePending;
 
   const LocoAttrVersion({
     required this.attrCode,
@@ -857,6 +868,8 @@ class LocoAttrVersion {
     this.precisionLevel,
     this.maskedValidFrom,
     this.valueNorm,
+    this.isPending = false,
+    this.canModeratePending = false,
   });
 
   factory LocoAttrVersion.fromJson(Map<String, dynamic> json) {
@@ -881,6 +894,8 @@ class LocoAttrVersion {
       precisionLevel: json['precision_level']?.toString(),
       maskedValidFrom: json['masked_valid_from']?.toString(),
       valueNorm: json['value_norm'],
+      isPending: json['is_pending'] == true,
+      canModeratePending: json['can_moderate_pending'] == true,
     );
   }
 
@@ -916,15 +931,19 @@ class LocoAttrVersion {
       });
     }
     items.sort(
-      (a, b) {
+      compareByStart,
-        final aDate = a.validFrom ?? a.txnFrom ?? DateTime.fromMillisecondsSinceEpoch(0);
+    );
-        final bDate = b.validFrom ?? b.txnFrom ?? DateTime.fromMillisecondsSinceEpoch(0);
+    return items;
+  }
+
+  static int compareByStart(LocoAttrVersion a, LocoAttrVersion b) {
+    final aDate =
+        a.validFrom ?? a.txnFrom ?? DateTime.fromMillisecondsSinceEpoch(0);
+    final bDate =
+        b.validFrom ?? b.txnFrom ?? DateTime.fromMillisecondsSinceEpoch(0);
     final dateCompare = aDate.compareTo(bDate);
     if (dateCompare != 0) return dateCompare;
     return a.attrCode.compareTo(b.attrCode);
-      },
-    );
-    return items;
   }
 
   String get valueLabel {

lib/services/accent_color_service.dart

@@ -0,0 +1,51 @@
+import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class AccentColorService extends ChangeNotifier {
+  static const _prefsKeyUseSystem = 'accent_use_system';
+  static const _prefsKeySeed = 'accent_seed';
+  static const Color defaultSeed = Colors.red;
+
+  bool _useSystem = true;
+  Color _seedColor = defaultSeed;
+  bool _hasSavedSeed = false;
+  bool _loaded = false;
+
+  bool get useSystem => _useSystem;
+  Color get seedColor => _seedColor;
+  bool get hasSavedSeed => _hasSavedSeed;
+  bool get isLoaded => _loaded;
+
+  AccentColorService() {
+    _load();
+  }
+
+  Future<void> _load() async {
+    final prefs = await SharedPreferences.getInstance();
+    _useSystem = prefs.getBool(_prefsKeyUseSystem) ?? true;
+    final seedValue = prefs.getInt(_prefsKeySeed);
+    if (seedValue != null) {
+      _seedColor = Color(seedValue);
+      _hasSavedSeed = true;
+    }
+    _loaded = true;
+    notifyListeners();
+  }
+
+  Future<void> setUseSystem(bool value) async {
+    _useSystem = value;
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setBool(_prefsKeyUseSystem, _useSystem);
+    notifyListeners();
+  }
+
+  Future<void> setSeedColor(Color color) async {
+    _seedColor = color;
+    _useSystem = false;
+    _hasSavedSeed = true;
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setInt(_prefsKeySeed, color.toARGB32());
+    await prefs.setBool(_prefsKeyUseSystem, _useSystem);
+    notifyListeners();
+  }
+}

lib/services/data_service/data_service_core.dart

@@ -52,6 +52,8 @@ class DataService extends ChangeNotifier {
   bool get isTractionLoading => _isTractionLoading;
   bool _tractionHasMore = false;
   bool get tractionHasMore => _tractionHasMore;
+  int _pendingLocoCount = 0;
+  int get pendingLocoCount => _pendingLocoCount;
   List<LocoChange> _latestLocoChanges = [];
   List<LocoChange> get latestLocoChanges => _latestLocoChanges;
   bool _isLatestLocoChangesLoading = false;
@@ -94,6 +96,22 @@ class DataService extends ChangeNotifier {
   bool _isEventFieldsLoading = false;
   bool get isEventFieldsLoading => _isEventFieldsLoading;
 
+  Future<void> fetchPendingLocoCount() async {
+    try {
+      final json = await api.get('/loco/pending?limit=1000&offset=0');
+      if (json is List) {
+        _pendingLocoCount = json.length;
+      } else {
+        _pendingLocoCount = 0;
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch pending loco count: $e');
+      _pendingLocoCount = 0;
+    } finally {
+      _notifyAsync();
+    }
+  }
+
   // Station Data
   final Map<String, List<Station>> _stationCache = {};
   final Map<String, Future<List<Station>>?> _stationInFlightByKey = {};
@@ -588,6 +606,39 @@ class DataService extends ChangeNotifier {
     }
   }
 
+  Future<void> deletePendingEvent({
+    required int eventId,
+  }) async {
+    try {
+      await api.delete('/event/pending/$eventId');
+    } catch (e) {
+      debugPrint('Failed to delete pending event $eventId: $e');
+      rethrow;
+    }
+  }
+
+  Future<void> approvePendingEvent({
+    required int eventId,
+  }) async {
+    try {
+      await api.put('/event/approve/$eventId', null);
+    } catch (e) {
+      debugPrint('Failed to approve pending event $eventId: $e');
+      rethrow;
+    }
+  }
+
+  Future<void> rejectPendingEvent({
+    required int eventId,
+  }) async {
+    try {
+      await api.put('/event/reject/$eventId', null);
+    } catch (e) {
+      debugPrint('Failed to reject pending event $eventId: $e');
+      rethrow;
+    }
+  }
+
   void clear() {
     _currentUserId = null;
     _lastLegsFetch = const _LegFetchOptions();

lib/services/data_service/data_service_friendships.dart

@@ -151,6 +151,8 @@ extension DataServiceFriendships on DataService {
       overrideAddressee: targetUser,
     );
     _pendingOutgoing = [friendship, ..._pendingOutgoing];
+    await fetchFriendships();
+    await fetchPendingFriendships();
     _notifyAsync();
     return friendship;
   }
@@ -159,6 +161,8 @@ extension DataServiceFriendships on DataService {
     final json = await api.post('/friendships/$friendshipId/accept', {});
     final friendship = _parseAndUpsertFriendship(json, fallbackStatus: 'accepted');
     _pendingIncoming = _pendingIncoming.where((f) => f.id != friendshipId).toList();
+    await fetchFriendships();
+    await fetchPendingFriendships();
     _notifyAsync();
     return friendship;
   }
@@ -177,6 +181,8 @@ extension DataServiceFriendships on DataService {
         _parseAndRemoveFriendship(json, friendshipId, status: 'none');
     _pendingOutgoing =
         _pendingOutgoing.where((f) => f.id != friendshipId).toList();
+    await fetchFriendships();
+    await fetchPendingFriendships();
     _notifyAsync();
     return friendship;
   }
@@ -193,6 +199,8 @@ extension DataServiceFriendships on DataService {
         _pendingIncoming.where((f) => f.id != friendshipId).toList();
     _pendingOutgoing =
         _pendingOutgoing.where((f) => f.id != friendshipId).toList();
+    await fetchFriendships();
+    await fetchPendingFriendships();
     _notifyAsync();
   }
 

lib/services/data_service/data_service_traction.dart

@@ -64,16 +64,71 @@ extension DataServiceTraction on DataService {
       _isTractionLoading = false;
     _notifyAsync();
   }
+
   }
 
-  Future<List<LocoAttrVersion>> fetchLocoTimeline(int locoId) async {
+  Future<List<LocoAttrVersion>> fetchLocoTimeline(
+    int locoId, {
+    bool includeAllPending = false,
+  }) async {
     _isLocoTimelineLoading[locoId] = true;
     _notifyAsync();
     try {
-      final json = await api.get('/loco/get-timeline/$locoId');
+      final baseJson = await api.get('/loco/get-timeline/$locoId');
-      final timeline = LocoAttrVersion.fromGroupedJson(json);
+      final timeline = LocoAttrVersion.fromGroupedJson(baseJson);
-      _locoTimelines[locoId] = timeline;
+      final baseKeys = timeline
-      return timeline;
+          .map(_entryKey)
+          .where((key) => key.isNotEmpty)
+          .toSet();
+      final pendingEntries = <LocoAttrVersion>[];
+      final pendingSeen = <String>{};
+
+      void addPending(List<LocoAttrVersion> entries) {
+        for (final entry in entries) {
+          final key = _entryKey(entry);
+          if (pendingSeen.contains(key)) continue;
+          if (baseKeys.contains(key)) continue;
+          pendingSeen.add(key);
+          pendingEntries.add(entry);
+          baseKeys.add(key);
+        }
+      }
+
+      try {
+        final pendingJson =
+            await api.get('/event/pending/user?loco_id=$locoId');
+        addPending(
+          _parsePendingLocoEvents(
+            pendingJson,
+            locoId,
+            canModerate: false,
+          ),
+        );
+      } catch (e) {
+        debugPrint('Failed to fetch pending loco events for $locoId: $e');
+      }
+
+      if (includeAllPending) {
+        try {
+          final pendingJson = await api.get('/event/pending?loco_id=$locoId');
+          addPending(
+            _parsePendingLocoEvents(
+              pendingJson,
+              locoId,
+              canModerate: true,
+            ),
+          );
+        } catch (e) {
+          debugPrint('Failed to fetch all pending loco events for $locoId: $e');
+        }
+      }
+
+      final merged = [
+        ...timeline,
+        ...pendingEntries,
+      ]..sort(LocoAttrVersion.compareByStart);
+      _locoTimelines[locoId] = merged;
+      return merged;
     } catch (e) {
       debugPrint('Failed to fetch loco timeline for $locoId: $e');
       _locoTimelines[locoId] = [];
@@ -84,6 +139,173 @@ extension DataServiceTraction on DataService {
     }
   }
 
+  Future<List<LocoAttrVersion>> fetchUserPendingEvents(int locoId) async {
+    try {
+      final pendingJson = await api.get('/event/pending/user?loco_id=$locoId');
+      return _parsePendingLocoEvents(
+        pendingJson,
+        locoId,
+        canModerate: false,
+      );
+    } catch (e) {
+      debugPrint('Failed to fetch user pending events for $locoId: $e');
+      return const [];
+    }
+  }
+
+  List<LocoAttrVersion> _parsePendingLocoEvents(
+    dynamic json,
+    int fallbackLocoId, {
+    bool canModerate = false,
+  }) {
+    if (json is! List) return const <LocoAttrVersion>[];
+    final entries = <LocoAttrVersion>[];
+    final seen = <String>{};
+    for (final item in json) {
+      if (item is! Map) continue;
+      final map = _extractPendingEventMap(item);
+      final locoId = (map['loco_id'] as num?)?.toInt() ?? fallbackLocoId;
+      final maskedValidFrom = map['masked_valid_from']?.toString();
+      final precision = map['precision_level']?.toString();
+      final username = map['username']?.toString();
+      final sourceEventId = (map['loco_event_id'] as num?)?.toInt();
+      final startDate = _parsePendingDate(map);
+      final status = map['moderation_status']?.toString().toLowerCase();
+      if (status != null && status != 'pending') continue;
+      if (startDate == null &&
+          (maskedValidFrom == null || maskedValidFrom.trim().isEmpty)) {
+        continue;
+      }
+      final valueMap = _decodeEventValues(map['loco_event_value']);
+      if (valueMap.isEmpty) continue;
+
+      valueMap.forEach((attr, rawValue) {
+        final attrCode = attr.toString();
+        if (attrCode.isEmpty) return;
+        final key = [
+          sourceEventId?.toString() ?? '',
+          attrCode.toLowerCase(),
+          maskedValidFrom ?? '',
+          startDate?.toIso8601String() ?? '',
+        ].join('|');
+        if (seen.contains(key)) return;
+        seen.add(key);
+        final parsedValue = _PendingTimelineValue.fromDynamic(rawValue);
+        entries.add(
+          LocoAttrVersion(
+            attrCode: attrCode,
+            locoId: locoId,
+            valueStr: parsedValue.valueStr,
+            valueInt: parsedValue.valueInt,
+            valueBool: parsedValue.valueBool,
+            valueDate: parsedValue.valueDate,
+            valueNorm: parsedValue.valueNorm ?? rawValue,
+            validFrom: startDate,
+            maskedValidFrom: maskedValidFrom,
+            precisionLevel: precision,
+            suggestedBy: username,
+            sourceEventId: sourceEventId,
+            isPending: true,
+            canModeratePending: canModerate,
+          ),
+        );
+      });
+    }
+    return entries;
+  }
+
+  String _entryKey(LocoAttrVersion entry) {
+    final attr = entry.attrCode.toLowerCase();
+    final masked = entry.maskedValidFrom?.trim() ?? '';
+    final start = entry.validFrom?.toIso8601String() ?? '';
+    final source = entry.sourceEventId?.toString() ?? '';
+    return '$attr|$masked|$start|$source';
+  }
+
+  Map<String, dynamic> _extractPendingEventMap(Map raw) {
+    if (raw['event_info'] is Map) {
+      final eventInfo = Map<String, dynamic>.from(raw['event_info']);
+      final merged = {...eventInfo};
+      for (final key in [
+        'loco_id',
+        'masked_valid_from',
+        'precision_level',
+        'username',
+        'loco_event_id',
+        'earliest_date',
+        'valid_from',
+        'loco_event_date',
+        'event_year',
+        'event_month',
+        'event_day',
+        'loco_event_value',
+      ]) {
+        merged.putIfAbsent(key, () => raw[key]);
+      }
+      return merged;
+    }
+    return Map<String, dynamic>.from(raw);
+  }
+
+  Map<String, dynamic> _decodeEventValues(dynamic raw) {
+    if (raw is Map) {
+      return raw.map((key, value) => MapEntry(key.toString(), value));
+    }
+    if (raw is String) {
+      final trimmed = raw.trim();
+      if (trimmed.isEmpty) return const {};
+      try {
+        final decoded = jsonDecode(trimmed);
+        if (decoded is Map) {
+          return decoded.map((key, value) => MapEntry(key.toString(), value));
+        }
+      } catch (_) {}
+    }
+    return const <String, dynamic>{};
+  }
+
+  DateTime? _parsePendingDate(Map<String, dynamic> json) {
+    DateTime? parseDate(dynamic value) {
+      if (value == null) return null;
+      if (value is DateTime) return value;
+      return DateTime.tryParse(value.toString());
+    }
+
+    // Try masked date by normalising unknown parts to 01 so we can position on the axis.
+    final masked = json['masked_valid_from']?.toString();
+    if (masked is String && masked.contains('-')) {
+      final sanitized = masked
+          .replaceAll(RegExp(r'[Xx?]{2}'), '01')
+          .replaceAll(RegExp(r'[Xx?]'), '1');
+      final parsedMasked = DateTime.tryParse(sanitized);
+      if (parsedMasked != null) return parsedMasked;
+    }
+
+    for (final key in ['earliest_date', 'valid_from', 'loco_event_date']) {
+      final parsed = parseDate(json[key]);
+      if (parsed != null) return parsed;
+    }
+
+    final year = _asNullableInt(json['event_year']);
+    if (year != null && year > 0) {
+      final monthValue = _asNullableInt(json['event_month']) ?? 1;
+      final dayValue = _asNullableInt(json['event_day']) ?? 1;
+      final month = monthValue.clamp(1, 12).toInt();
+      final day = dayValue.clamp(1, 31).toInt();
+      try {
+        return DateTime(year, month, day);
+      } catch (_) {}
+    }
+    return null;
+  }
+
+  int? _asNullableInt(dynamic value) {
+    if (value == null) return null;
+    if (value is int) return value;
+    if (value is num) return value.toInt();
+    return int.tryParse(value.toString());
+  }
+
   Future<dynamic> createLoco(Map<String, dynamic> payload) async {
     try {
       final response = await api.put('/loco/new', payload);
@@ -101,8 +323,9 @@ extension DataServiceTraction on DataService {
     }
   }
 
-  Future<List<String>> fetchClassList() async {
+  Future<List<String>> fetchClassList({bool force = false}) async {
-    if (_locoClasses.isNotEmpty) return _locoClasses;
+    if (!force && _locoClasses.isNotEmpty) return _locoClasses;
+    if (force) _locoClasses = [];
     try {
       final json = await api.get('/loco/classlist');
       if (json is List) {
@@ -214,4 +437,105 @@ extension DataServiceTraction on DataService {
       return const [];
     }
   }
+
+  Future<void> acceptPendingLoco({required int locoId}) async {
+    try {
+      await api.put('/loco/pending/approve/$locoId', null);
+    } catch (e) {
+      debugPrint('Failed to approve pending loco $locoId: $e');
+      rethrow;
+    }
+  }
+
+  Future<void> rejectPendingLoco({
+    required int locoId,
+    int? replacementLocoId,
+    String? rejectedReason,
+  }) async {
+    try {
+      final body = <String, dynamic>{};
+      if (replacementLocoId != null) {
+        body['replacement_loco_id'] = replacementLocoId;
+      }
+      if (rejectedReason != null && rejectedReason.trim().isNotEmpty) {
+        body['rejected_reason'] = rejectedReason.trim();
+      }
+      await api.put('/loco/pending/reject/$locoId', body.isEmpty ? null : body);
+    } catch (e) {
+      debugPrint('Failed to reject pending loco $locoId: $e');
+      rethrow;
+    }
+  }
+
+  Future<void> transferAllocations({
+    required int fromLocoId,
+    required int toLocoId,
+  }) async {
+    try {
+      await api.post('/loco/alloc/transfer', {
+        'from_loco_id': fromLocoId,
+        'to_loco_id': toLocoId,
+      });
+    } catch (e) {
+      debugPrint('Failed to transfer allocations $fromLocoId -> $toLocoId: $e');
+      rethrow;
+    }
+  }
+
+  Future<void> adminDeleteLoco({required int locoId}) async {
+    try {
+      await api.delete('/loco/admin/delete/$locoId');
+    } catch (e) {
+      debugPrint('Failed to delete loco $locoId as admin: $e');
+      rethrow;
+    }
+  }
+}
+
+class _PendingTimelineValue {
+  final String? valueStr;
+  final int? valueInt;
+  final bool? valueBool;
+  final DateTime? valueDate;
+  final dynamic valueNorm;
+
+  const _PendingTimelineValue({
+    this.valueStr,
+    this.valueInt,
+    this.valueBool,
+    this.valueDate,
+    this.valueNorm,
+  });
+
+  factory _PendingTimelineValue.fromDynamic(dynamic raw) {
+    if (raw is Map || raw is List) {
+      return _PendingTimelineValue(valueStr: jsonEncode(raw));
+    }
+    if (raw is bool) return _PendingTimelineValue(valueBool: raw);
+    if (raw is int) return _PendingTimelineValue(valueInt: raw);
+    if (raw is num) return _PendingTimelineValue(valueNorm: raw);
+    if (raw is String) {
+      final trimmed = raw.trim();
+      if (trimmed.isEmpty) return const _PendingTimelineValue(valueStr: '');
+      final lower = trimmed.toLowerCase();
+      if (['true', 'yes', 'y'].contains(lower)) {
+        return const _PendingTimelineValue(valueBool: true);
+      }
+      if (['false', 'no', 'n'].contains(lower)) {
+        return const _PendingTimelineValue(valueBool: false);
+      }
+      final intVal = int.tryParse(trimmed);
+      if (intVal != null) return _PendingTimelineValue(valueInt: intVal);
+      final doubleVal = double.tryParse(trimmed);
+      if (doubleVal != null) {
+        return _PendingTimelineValue(valueNorm: doubleVal);
+      }
+      final dateVal = DateTime.tryParse(trimmed);
+      if (dateVal != null) {
+        return _PendingTimelineValue(valueDate: dateVal);
+      }
+      return _PendingTimelineValue(valueStr: trimmed);
+    }
+    return _PendingTimelineValue(valueNorm: raw);
+  }
 }

lib/services/theme_mode_service.dart

@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class ThemeModeService extends ChangeNotifier {
+  static const _prefsKey = 'theme_mode_preference';
+
+  ThemeMode _mode = ThemeMode.system;
+  bool _loaded = false;
+
+  ThemeMode get mode => _mode;
+  bool get isLoaded => _loaded;
+
+  ThemeModeService() {
+    _load();
+  }
+
+  Future<void> _load() async {
+    final prefs = await SharedPreferences.getInstance();
+    final saved = prefs.getString(_prefsKey);
+    if (saved != null) {
+      switch (saved) {
+        case 'light':
+          _mode = ThemeMode.light;
+          break;
+        case 'dark':
+          _mode = ThemeMode.dark;
+          break;
+        default:
+          _mode = ThemeMode.system;
+      }
+    }
+    _loaded = true;
+    notifyListeners();
+  }
+
+  Future<void> setMode(ThemeMode mode) async {
+    _mode = mode;
+    final prefs = await SharedPreferences.getInstance();
+    final value = switch (mode) {
+      ThemeMode.light => 'light',
+      ThemeMode.dark => 'dark',
+      _ => 'system',
+    };
+    await prefs.setString(_prefsKey, value);
+    notifyListeners();
+  }
+}

lib/ui/app_shell.dart

@@ -20,14 +20,18 @@ import 'package:mileograph_flutter/components/pages/profile.dart';
 import 'package:mileograph_flutter/components/pages/settings.dart';
 import 'package:mileograph_flutter/components/pages/stats.dart';
 import 'package:mileograph_flutter/components/pages/traction.dart';
+import 'package:mileograph_flutter/components/pages/traction/traction_pending_page.dart';
+import 'package:mileograph_flutter/components/pages/traction/traction_pending_changes_page.dart';
 import 'package:mileograph_flutter/components/pages/more/user_profile_page.dart';
 import 'package:mileograph_flutter/components/widgets/friend_request_notification_card.dart';
 import 'package:mileograph_flutter/components/widgets/leg_share_edit_notification_card.dart';
 import 'package:mileograph_flutter/components/widgets/leg_share_notification_card.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
+import 'package:mileograph_flutter/services/accent_color_service.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:mileograph_flutter/services/navigation_guard.dart';
+import 'package:mileograph_flutter/services/theme_mode_service.dart';
 import 'package:provider/provider.dart';
 
 final GlobalKey<NavigatorState> _shellNavigatorKey =
@@ -102,12 +106,6 @@ class _MyAppState extends State<MyApp> {
   late final GoRouter _router;
   bool _routerInitialized = false;
 
-  final ColorScheme defaultLight = ColorScheme.fromSeed(seedColor: Colors.red);
-  final ColorScheme defaultDark = ColorScheme.fromSeed(
-    seedColor: Colors.red,
-    brightness: Brightness.dark,
-  );
-
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
@@ -170,7 +168,64 @@ class _MyAppState extends State<MyApp> {
             ),
             GoRoute(
               path: '/traction',
-              builder: (context, state) => TractionPage(),
+              builder: (context, state) {
+                final selectionParam =
+                    state.uri.queryParameters['selection'] ??
+                        (state.extra is Map
+                            ? (state.extra as Map)['selection']?.toString()
+                            : null);
+                final replacementPendingLocoIdStr =
+                    state.uri.queryParameters['replacementPendingLocoId'];
+                final replacementPendingLocoId = replacementPendingLocoIdStr != null
+                    ? int.tryParse(replacementPendingLocoIdStr)
+                    : state.extra is Map
+                        ? int.tryParse(
+                            (state.extra as Map)['replacementPendingLocoId']
+                                    ?.toString() ??
+                                '',
+                          )
+                        : null;
+                final transferFromLocoIdStr =
+                    state.uri.queryParameters['transferFromLocoId'];
+                final transferFromLocoId = transferFromLocoIdStr != null
+                    ? int.tryParse(transferFromLocoIdStr)
+                    : state.extra is Map
+                        ? int.tryParse(
+                            (state.extra as Map)['transferFromLocoId']
+                                    ?.toString() ??
+                                '',
+                          )
+                        : null;
+                final transferFromLabel = state.uri.queryParameters['transferFromLabel'] ??
+                    (state.extra is Map
+                        ? (state.extra as Map)['transferFromLabel']?.toString()
+                        : null);
+                final selectionMode =
+                    (selectionParam != null && selectionParam.isNotEmpty) ||
+                        replacementPendingLocoId != null ||
+                        transferFromLocoId != null;
+                final selectionSingle = replacementPendingLocoId != null ||
+                    transferFromLocoId != null ||
+                    selectionParam?.toLowerCase() == 'single' ||
+                        selectionParam == '1' ||
+                        selectionParam?.toLowerCase() == 'true';
+                return TractionPage(
+                  selectionMode: selectionMode,
+                  selectionSingle: selectionSingle,
+                  replacementPendingLocoId: replacementPendingLocoId,
+                  transferFromLabel: transferFromLabel,
+                  transferFromLocoId: transferFromLocoId,
+                );
+              },
+            ),
+            GoRoute(
+              path: '/traction/pending',
+              builder: (context, state) => const TractionPendingPage(),
+            ),
+            GoRoute(
+              path: '/traction/changes',
+              builder: (context, state) =>
+                  const TractionPendingChangesPage(),
             ),
             GoRoute(
               path: '/profile',
@@ -189,7 +244,15 @@ class _MyAppState extends State<MyApp> {
                   label = extra;
                 }
                 if (label.trim().isEmpty) label = 'Loco $locoId';
-                return LocoTimelinePage(locoId: locoId, locoLabel: label);
+                bool showPending = false;
+                if (extra is Map && extra['showPending'] is bool) {
+                  showPending = extra['showPending'] as bool;
+                }
+                return LocoTimelinePage(
+                  locoId: locoId,
+                  locoLabel: label,
+                  forceShowPending: showPending,
+                );
               },
             ),
             GoRoute(
@@ -291,20 +354,34 @@ class _MyAppState extends State<MyApp> {
 
   @override
   Widget build(BuildContext context) {
+    final accent = context.watch<AccentColorService>();
+    final themeModeService = context.watch<ThemeModeService>();
+    final seedColor =
+        accent.hasSavedSeed ? accent.seedColor : AccentColorService.defaultSeed;
+    final useSystemColors = accent.useSystem;
     return DynamicColorBuilder(
       builder: (ColorScheme? lightDynamic, ColorScheme? darkDynamic) {
+        final colorSchemeLight = useSystemColors && lightDynamic != null
+            ? lightDynamic
+            : ColorScheme.fromSeed(seedColor: seedColor);
+        final colorSchemeDark = useSystemColors && darkDynamic != null
+            ? darkDynamic
+            : ColorScheme.fromSeed(
+                seedColor: seedColor,
+                brightness: Brightness.dark,
+              );
         return MaterialApp.router(
           title: 'Mileograph',
           routerConfig: _router,
           theme: ThemeData(
             useMaterial3: true,
-            colorScheme: lightDynamic ?? defaultLight,
+            colorScheme: colorSchemeLight,
           ),
           darkTheme: ThemeData(
             useMaterial3: true,
-            colorScheme: darkDynamic ?? defaultDark,
+            colorScheme: colorSchemeDark,
           ),
-          themeMode: ThemeMode.system,
+          themeMode: themeModeService.mode,
         );
       },
     );
@@ -460,10 +537,7 @@ class _MyHomePageState extends State<MyHomePage> {
             )
             .toList();
 
-        return Scaffold(
+        final logo = Text.rich(
-          appBar: AppBar(
-            backgroundColor: Theme.of(context).colorScheme.inversePrimary,
-            title: Text.rich(
           TextSpan(
             children: const [
               TextSpan(text: "Mile"),
@@ -479,6 +553,17 @@ class _MyHomePageState extends State<MyHomePage> {
               fontFamily: "Tomatoes",
             ),
           ),
+        );
+
+        return Scaffold(
+          appBar: AppBar(
+            backgroundColor: Theme.of(context).colorScheme.inversePrimary,
+            title: isWide
+                ? logo
+                : FittedBox(
+                    fit: BoxFit.scaleDown,
+                    alignment: Alignment.centerLeft,
+                    child: logo,
                   ),
             actions: [
               _buildNotificationAction(context, data),

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.6.5+7
+version: 0.7.3+11
 
 environment:
   sdk: ^3.8.1