move transfer button, hide delete button better

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

@@ -55,26 +55,19 @@ class _StationAutocompleteState extends State<StationAutocomplete> {
       },
       fieldViewBuilder:
           (context, textEditingController, focusNode, onFieldSubmitted) {
-            textEditingController.value = _controller.value;
+        textEditingController.value = _controller.value;
 
-            return TextField(
+        return TextField(
-              controller: textEditingController,
+          controller: textEditingController,
-              focusNode: focusNode,
+          focusNode: focusNode,
-              textInputAction: TextInputAction.done,
+          textInputAction: TextInputAction.done,
-              onSubmitted: (_) {
+          onSubmitted: (_) => onFieldSubmitted(),
-                final matches = _findTopMatches(textEditingController.text);
+          decoration: const InputDecoration(
-                final firstMatch = matches.isEmpty ? null : matches.first;
+            labelText: 'Select station',
-                if (firstMatch == null) return;
+            border: OutlineInputBorder(),
-                _controller.text = firstMatch;
+          ),
-                widget.onChanged(firstMatch);
+        );
-                focusNode.unfocus(); // optionally close keyboard
+      },
-              },
-              decoration: const InputDecoration(
-                labelText: 'Select station',
-                border: OutlineInputBorder(),
-              ),
-            );
-          },
     );
   }
 
@@ -181,6 +174,14 @@ class _RouteCalculatorState extends State<RouteCalculator> {
   }
 
   Future<void> _calculateRoute(List<String> stations) async {
+    final cleaned = stations.where((s) => s.trim().isNotEmpty).toList();
+    if (cleaned.length < 2) {
+      setState(() {
+        _routeResult = null;
+        _errorMessage = 'Add at least two stations before calculating.';
+      });
+      return;
+    }
     setState(() {
       _errorMessage = null;
       _routeResult = null;
@@ -188,7 +189,7 @@ class _RouteCalculatorState extends State<RouteCalculator> {
     final api = context.read<ApiService>(); // context is valid here
     try {
       final res = await api.post('/route/distance2', {
-        'route': stations.where((s) => s.trim().isNotEmpty).toList(),
+        'route': cleaned,
       });
 
       if (res is Map && res['error'] == false) {
@@ -232,11 +233,28 @@ class _RouteCalculatorState extends State<RouteCalculator> {
     });
   }
 
+  void _clearCalculator() {
+    final data = context.read<DataService>();
+    setState(() {
+      data.stations = [''];
+      _routeResult = null;
+      _errorMessage = null;
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
     return Column(
       children: [
+        Align(
+          alignment: Alignment.centerRight,
+          child: IconButton(
+            tooltip: 'Clear calculator',
+            icon: const Icon(Icons.clear_all),
+            onPressed: _clearCalculator,
+          ),
+        ),
         Padding(
           padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
           child: Wrap(
@@ -366,28 +384,34 @@ class _RouteCalculatorState extends State<RouteCalculator> {
             spacing: 12,
             runSpacing: 8,
             children: [
-              ElevatedButton.icon(
+              ...(() {
-                icon: const Icon(Icons.swap_horiz),
+                final reverseButton = ElevatedButton.icon(
-                label: const Text('Reverse route'),
+                  icon: const Icon(Icons.swap_horiz),
-                onPressed: () async {
+                  label: const Text('Reverse route'),
-                  setState(() {
+                  onPressed: () async {
-                    data.stations = data.stations.reversed.toList();
+                    setState(() {
-                  });
+                      data.stations = data.stations.reversed.toList();
-                  await _calculateRoute(data.stations);
+                    });
-                },
+                    await _calculateRoute(data.stations);
-              ),
+                  },
-              ElevatedButton.icon(
+                );
-                icon: const Icon(Icons.add),
+                final addButton = ElevatedButton.icon(
-                label: const Text('Add Station'),
+                  icon: const Icon(Icons.add),
-                onPressed: _addStation,
+                  label: const Text('Add Station'),
-              ),
+                  onPressed: _addStation,
-              ElevatedButton.icon(
+                );
-                icon: const Icon(Icons.route),
+                final calculateButton = ElevatedButton.icon(
-                label: const Text('Calculate Route'),
+                  icon: const Icon(Icons.route),
-                onPressed: () async {
+                  label: const Text('Calculate Route'),
-                  await _calculateRoute(data.stations);
+                  onPressed: () async {
-                },
+                    await _calculateRoute(data.stations);
-              ),
+                  },
+                );
+                final isMobile = MediaQuery.of(context).size.width < 600;
+                return isMobile
+                    ? [addButton, reverseButton, calculateButton]
+                    : [reverseButton, addButton, calculateButton];
+              })(),
             ],
           ),
         ),

lib/components/dashboard/leaderboard_panel.dart

@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.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';
@@ -130,14 +132,38 @@ class _LeaderboardPanelState extends State<LeaderboardPanel> {
                           fontWeight: FontWeight.w700,
                         ),
                       ),
-                      trailing: Text(
+                      trailing: Wrap(
-                        distanceUnits.format(
+                        crossAxisAlignment: WrapCrossAlignment.center,
-                          leaderboard[index].mileage,
+                        spacing: 8,
-                          decimals: 1,
+                        children: [
-                        ),
+                          Text(
-                        style: textTheme.labelLarge?.copyWith(
+                            distanceUnits.format(
-                          fontWeight: FontWeight.w700,
+                              leaderboard[index].mileage,
-                        ),
+                              decimals: 1,
+                            ),
+                            style: textTheme.labelLarge?.copyWith(
+                              fontWeight: FontWeight.w700,
+                            ),
+                          ),
+                          Builder(
+                            builder: (ctx) => IconButton(
+                              tooltip: 'View profile',
+                              icon: const Icon(Icons.open_in_new, size: 20),
+                              onPressed: () {
+                                final auth = ctx.read<AuthService>();
+                                final userId = leaderboard[index].userId;
+                                if (auth.userId == userId) {
+                                  ctx.go('/more/profile');
+                                } else {
+                                  ctx.pushNamed(
+                                    'user-profile',
+                                    queryParameters: {'user_id': userId},
+                                  );
+                                }
+                              },
+                            ),
+                          ),
+                        ],
                       ),
                     ),
                     if (index != leaderboard.length - 1) const Divider(height: 12),

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,6 +5,7 @@ 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';
 
@@ -29,6 +30,7 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
   final List<_EventDraft> _draftEvents = [];
   bool _isSaving = false;
   bool _isDeleting = false;
+  bool _isModerating = false;
 
   @override
   void initState() {
@@ -59,8 +61,12 @@ 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,
+    );
   }
 
   void _addDraftEvent() {
@@ -151,8 +157,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 +209,23 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
       _isDeleting = true;
     });
     try {
-      await data.deleteTimelineBlock(
+      if (isPending && pendingEventId != null) {
-        blockId: blockId,
+        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 +243,79 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
     }
   }
 
+  Future<void> _moderatePendingEntry(
+    LocoAttrVersion entry,
+    _PendingModerationAction action,
+  ) async {
+    if (_isModerating) return;
+    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;
+    }
+    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(() {
+      _isModerating = true;
+    });
+    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(() {
+          _isModerating = false;
+        });
+      }
+    }
+  }
+
   void _removeDraftAt(int index) {
     if (index < 0 || index >= _draftEvents.length) return;
     final draft = _draftEvents.removeAt(index);
@@ -248,6 +347,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 +376,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 +421,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)$');
@@ -412,6 +557,8 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
                     data.eventFields,
                   ),
                   onDeleteEntry: _deleteEntry,
+                  onModeratePending: _moderatePendingEntry,
+                  pendingActionsBusy: _isModerating,
                 ),
                 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: [
-                OutlinedButton.icon(
+                if (!hasDrafts) ...[
-                  onPressed: onAddEvent,
+                  OutlinedButton.icon(
-                  icon: const Icon(Icons.add),
+                    onPressed: onAddEvent,
-                  label: const Text('New event'),
+                    icon: const Icon(Icons.add),
-                ),
+                    label: const Text('New event'),
-                const SizedBox(width: 8),
+                  ),
+                  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,25 @@ 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.pendingActionsBusy = false,
   });
 
   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 bool pendingActionsBusy;
 
   @override
   State<_TimelineGrid> createState() => _TimelineGridState();
@@ -191,6 +200,8 @@ class _TimelineGridState extends State<_TimelineGrid> {
                                     viewportWidth: axisWidth,
                                     onEditEntry: widget.onEditEntry,
                                     onDeleteEntry: widget.onDeleteEntry,
+                                    onModeratePending: widget.onModeratePending,
+                                    pendingActionsBusy: widget.pendingActionsBusy,
                                   ),
                                 );
                               },
@@ -276,6 +287,8 @@ class _AttrRow extends StatelessWidget {
     required this.viewportWidth,
     this.onEditEntry,
     this.onDeleteEntry,
+    this.onModeratePending,
+    this.pendingActionsBusy = false,
   });
 
   final double rowHeight;
@@ -285,6 +298,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 bool pendingActionsBusy;
 
   @override
   Widget build(BuildContext context) {
@@ -310,6 +328,8 @@ class _AttrRow extends StatelessWidget {
                 block: block,
                 onEditEntry: onEditEntry,
                 onDeleteEntry: onDeleteEntry,
+                onModeratePending: onModeratePending,
+                pendingActionsBusy: pendingActionsBusy,
               ),
             ),
           if (activeBlock != null)
@@ -326,6 +346,7 @@ class _AttrRow extends StatelessWidget {
                       width: stickyWidth,
                     ),
                     clipLeftEdge: scrollOffset > activeBlock.left + 0.1,
+                    pendingActionsBusy: pendingActionsBusy,
                   ),
                 ),
               ),
@@ -347,15 +368,17 @@ class _ValueBlockView extends StatelessWidget {
   const _ValueBlockView({
     required this.block,
     this.clipLeftEdge = false,
+    this.pendingActionsBusy = false,
   });
 
   final _ValueBlock block;
   final bool clipLeftEdge;
+  final bool pendingActionsBusy;
 
   @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
@@ -386,32 +409,63 @@ class _ValueBlockView extends StatelessWidget {
                 fit: BoxFit.scaleDown,
                 child: ConstrainedBox(
                   constraints: const BoxConstraints(minWidth: 1, minHeight: 1),
-                  child: Column(
+                  child: Row(
                     crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisAlignment: MainAxisAlignment.center,
                     children: [
-                      Text(
+                      Column(
-                        block.cell.value,
+                        crossAxisAlignment: CrossAxisAlignment.start,
-                        maxLines: 1,
+                        mainAxisAlignment: MainAxisAlignment.center,
-                        overflow: TextOverflow.ellipsis,
+                        children: [
-                        style: theme.textTheme.bodyMedium?.copyWith(
+                          Row(
-                              fontWeight: FontWeight.w700,
+                            mainAxisSize: MainAxisSize.min,
-                              color: textColor,
+                            children: [
-                            ) ??
+                              if (block.cell.isPending)
-                            TextStyle(
+                                Padding(
-                              fontWeight: FontWeight.w700,
+                                  padding: const EdgeInsets.only(right: 6),
-                              color: textColor,
+                                  child: SizedBox(
-                            ),
+                                    width: 16,
-                      ),
+                                    height: 16,
-                      const SizedBox(height: 4),
+                                    child: pendingActionsBusy
-                      Text(
+                                        ? CircularProgressIndicator(
-                        block.cell.rangeLabel,
+                                            strokeWidth: 2,
-                        maxLines: 1,
+                                            valueColor:
-                        overflow: TextOverflow.ellipsis,
+                                                AlwaysStoppedAnimation(textColor),
-                        style: theme.textTheme.labelSmall?.copyWith(
+                                          )
-                              color: textColor.withValues(alpha: 0.9),
+                                        : Icon(
-                            ) ??
+                                            Icons.pending,
-                            TextStyle(color: textColor.withValues(alpha: 0.9)),
+                                            size: 16,
+                                            color: textColor,
+                                          ),
+                                  ),
+                                ),
+                              Text(
+                                block.cell.value,
+                                maxLines: 1,
+                                overflow: TextOverflow.ellipsis,
+                                style: theme.textTheme.bodyMedium?.copyWith(
+                                      fontWeight: FontWeight.w700,
+                                      color: textColor,
+                                    ) ??
+                                    TextStyle(
+                                      fontWeight: FontWeight.w700,
+                                      color: textColor,
+                                    ),
+                              ),
+                            ],
+                          ),
+                          const SizedBox(height: 4),
+                          Text(
+                            block.cell.rangeLabel,
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            style: theme.textTheme.labelSmall?.copyWith(
+                                  color: textColor.withValues(alpha: 0.9),
+                                ) ??
+                                TextStyle(
+                                  color: textColor.withValues(alpha: 0.9),
+                                ),
+                          ),
+                        ],
                       ),
                     ],
                   ),
@@ -422,26 +476,45 @@ 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.pendingActionsBusy = false,
   });
 
   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 bool pendingActionsBusy;
 
-  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;
 
     Future<void> showContextMenuAt(Offset globalPosition) async {
       final overlay = Overlay.of(context);
@@ -459,11 +532,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: !pendingActionsBusy,
+              child: const Text('Approve pending'),
+            ),
+          if (canModerate)
+            PopupMenuItem(
+              value: _TimelineBlockAction.reject,
+              enabled: !pendingActionsBusy,
+              child: const Text('Reject pending'),
+            ),
           if (onDeleteEntry != null)
             const PopupMenuItem(
               value: _TimelineBlockAction.delete,
@@ -481,11 +566,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 +586,10 @@ class _ValueBlockMenu extends StatelessWidget {
       onSecondaryTapDown: (details) async {
         await showContextMenuAt(details.globalPosition);
       },
-      child: _ValueBlockView(block: block),
+      child: _ValueBlockView(
+        block: block,
+        pendingActionsBusy: pendingActionsBusy,
+      ),
     );
   }
 }
@@ -518,7 +612,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) {
@@ -550,8 +665,11 @@ class _TimelineModel {
   });
 
   factory _TimelineModel.fromEntries(List<LocoAttrVersion> entries) {
+    final effectiveEntries = entries
+        .where((e) => _effectiveStart(e) != null)
+        .toList();
     final grouped = <String, List<LocoAttrVersion>>{};
-    for (final entry in entries) {
+    for (final entry in effectiveEntries) {
       grouped.putIfAbsent(entry.attrCode, () => []).add(entry);
     }
     final now = DateTime.now();
@@ -774,11 +892,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 +907,7 @@ class _RowCell {
         value: '',
         rangeLabel: '',
         color: Colors.transparent,
+        isPending: false,
       );
     }
     final entry = seg.entry;
@@ -802,6 +923,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/more/user_profile_page.dart

@@ -17,11 +17,13 @@ class UserProfilePage extends StatefulWidget {
 }
 
 class _UserProfilePageState extends State<UserProfilePage> {
+  static const int _pageSize = 22;
   UserProfileDetail? _profile;
   List<Leg> _legs = const [];
   bool _loading = false;
   bool _loadingMore = false;
   bool _hasMore = false;
+  bool _lastFetchReturnedData = true;
   Friendship? _friendship;
   bool _actionsLoading = false;
 
@@ -39,9 +41,9 @@ class _UserProfilePageState extends State<UserProfilePage> {
     final userId = _userId;
     if (userId == null || userId.isEmpty) {
       if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
+        ScaffoldMessenger.of(
-          const SnackBar(content: Text('No user selected.')),
+          context,
-        );
+        ).showSnackBar(const SnackBar(content: Text('No user selected.')));
         context.pop();
       }
       return;
@@ -66,7 +68,8 @@ class _UserProfilePageState extends State<UserProfilePage> {
       setState(() {
         _profile = profile;
         _legs = legs;
-        _hasMore = legs.length >= 25;
+        _lastFetchReturnedData = legs.isNotEmpty;
+        _hasMore = _lastFetchReturnedData && _legs.length >= _pageSize;
         _friendship = friendship;
       });
     } finally {
@@ -83,11 +86,13 @@ class _UserProfilePageState extends State<UserProfilePage> {
       final more = await data.fetchUserLegs(
         userId: userId,
         offset: _legs.length,
+        limit: _pageSize,
       );
       if (!mounted) return;
       setState(() {
         _legs = [..._legs, ...more];
-        _hasMore = more.length >= 25;
+        _lastFetchReturnedData = more.isNotEmpty;
+        _hasMore = _lastFetchReturnedData && _legs.length >= _pageSize;
       });
     } finally {
       if (mounted) setState(() => _loadingMore = false);
@@ -110,7 +115,9 @@ class _UserProfilePageState extends State<UserProfilePage> {
     final mileage = profile?.mileage;
     final privacy = profile?.privacyInfo;
     final mileageHidden =
-        (mileage == null || mileage == 0) && privacy != null && privacy.isNotEmpty;
+        (mileage == null || mileage == 0) &&
+        privacy != null &&
+        privacy.isNotEmpty;
     return Card(
       child: Padding(
         padding: const EdgeInsets.all(12.0),
@@ -152,9 +159,7 @@ class _UserProfilePageState extends State<UserProfilePage> {
       return const SizedBox.shrink();
     }
     final topTen = [...profile.topLocos]
-      ..sort(
+      ..sort((a, b) => (b.mileage ?? 0).compareTo(a.mileage ?? 0));
-        (a, b) => (b.mileage ?? 0).compareTo(a.mileage ?? 0),
-      );
     final displayLocos = topTen.take(10).toList();
     return Card(
       child: Padding(
@@ -177,15 +182,14 @@ class _UserProfilePageState extends State<UserProfilePage> {
                 final mileage = loco.mileage ?? 0;
                 return ListTile(
                   leading: CircleAvatar(
-                    backgroundColor: Theme.of(context)
+                    backgroundColor: Theme.of(
-                        .colorScheme
+                      context,
-                        .primary
+                    ).colorScheme.primary.withValues(alpha: 0.1),
-                        .withValues(alpha: 0.1),
                     child: Text(
                       '${index + 1}',
                       style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                            fontWeight: FontWeight.bold,
+                        fontWeight: FontWeight.bold,
-                          ),
+                      ),
                     ),
                   ),
                   title: Text(
@@ -195,10 +199,9 @@ class _UserProfilePageState extends State<UserProfilePage> {
                   subtitle: Text(loco.locoClass),
                   trailing: Text(
                     '${mileage.toStringAsFixed(1)} mi',
-                    style: Theme.of(context)
+                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                        .textTheme
+                      fontWeight: FontWeight.w700,
-                        .bodyMedium
+                    ),
-                        ?.copyWith(fontWeight: FontWeight.w700),
                   ),
                 );
               },
@@ -211,8 +214,9 @@ class _UserProfilePageState extends State<UserProfilePage> {
 
   List<Widget> _buildLegsWithDividers(
     BuildContext context,
-    List<Leg> legs,
+    List<Leg> legs, {
-  ) {
+    required bool showEditButton,
+  }) {
     final widgets = <Widget>[];
     String? currentDate;
     final dayLegs = <Leg>[];
@@ -225,15 +229,21 @@ class _UserProfilePageState extends State<UserProfilePage> {
           padding: const EdgeInsets.symmetric(vertical: 8.0),
           child: Text(
             date,
-            style: Theme.of(context).textTheme.labelMedium?.copyWith(
+            style: Theme.of(
-                  fontWeight: FontWeight.w700,
+              context,
-                ),
+            ).textTheme.labelMedium?.copyWith(fontWeight: FontWeight.w700),
           ),
         ),
       );
       widgets.add(const Divider());
       widgets.addAll(
-        dayLegs.map((leg) => LegCard(leg: leg, showDate: false)),
+        dayLegs.map(
+          (leg) => LegCard(
+            leg: leg,
+            showDate: false,
+            showEditButton: showEditButton,
+          ),
+        ),
       );
       dayLegs.clear();
     }
@@ -295,7 +305,9 @@ class _UserProfilePageState extends State<UserProfilePage> {
         break;
       case 'pending':
         final isRequester = status.requesterId == auth.userId;
-        label = isRequester ? 'Pending (you sent)' : 'Pending (needs your reply)';
+        label = isRequester
+            ? 'Pending (you sent)'
+            : 'Pending (needs your reply)';
         color = Colors.orange;
         break;
       case 'blocked':
@@ -325,10 +337,9 @@ class _UserProfilePageState extends State<UserProfilePage> {
   }
 
   Widget _buildActions(Friendship status, AuthService auth) {
-    final isSelf = status.addresseeId == auth.userId || status.requesterId == auth.userId;
+    final targetUserId = _userId;
-    if (isSelf) {
+    final isSelf = targetUserId != null && targetUserId == auth.userId;
-      return const Text('This is you.');
+    if (isSelf) return const Text('This is you.');
-    }
     final isRequester = status.requesterId == auth.userId;
     final id = status.id;
     final buttons = <Widget>[];
@@ -350,10 +361,12 @@ class _UserProfilePageState extends State<UserProfilePage> {
           onPressed: _actionsLoading
               ? null
               : () => run(() async {
-                    final updated = await data.requestFriendship(status.addresseeId);
+                  final updated = await data.requestFriendship(
-                    if (!mounted) return;
+                    status.addresseeId,
-                    setState(() => _friendship = updated);
+                  );
-                  }),
+                  if (!mounted) return;
+                  setState(() => _friendship = updated);
+                }),
           icon: const Icon(Icons.person_add),
           label: const Text('Send friend request'),
         ),
@@ -365,10 +378,12 @@ class _UserProfilePageState extends State<UserProfilePage> {
             onPressed: _actionsLoading || id == null || id.isEmpty
                 ? null
                 : () => run(() async {
-                      await data.cancelFriendship(id);
+                    await data.cancelFriendship(id);
-                      if (!mounted) return;
+                    if (!mounted) return;
-                      setState(() => _friendship = status.copyWith(status: 'none'));
+                    setState(
-                    }),
+                      () => _friendship = status.copyWith(status: 'none'),
+                    );
+                  }),
             child: const Text('Cancel request'),
           ),
         );
@@ -378,10 +393,10 @@ class _UserProfilePageState extends State<UserProfilePage> {
             onPressed: _actionsLoading || id == null || id.isEmpty
                 ? null
                 : () => run(() async {
-                      final updated = await data.acceptFriendship(id);
+                    final updated = await data.acceptFriendship(id);
-                      if (!mounted) return;
+                    if (!mounted) return;
-                      setState(() => _friendship = updated);
+                    setState(() => _friendship = updated);
-                    }),
+                  }),
             child: const Text('Accept'),
           ),
         );
@@ -390,10 +405,10 @@ class _UserProfilePageState extends State<UserProfilePage> {
             onPressed: _actionsLoading || id == null || id.isEmpty
                 ? null
                 : () => run(() async {
-                      final updated = await data.rejectFriendship(id);
+                    final updated = await data.rejectFriendship(id);
-                      if (!mounted) return;
+                    if (!mounted) return;
-                      setState(() => _friendship = updated);
+                    setState(() => _friendship = updated);
-                    }),
+                  }),
             child: const Text('Reject'),
           ),
         );
@@ -404,10 +419,10 @@ class _UserProfilePageState extends State<UserProfilePage> {
           onPressed: _actionsLoading || id == null || id.isEmpty
               ? null
               : () => run(() async {
-                    await data.deleteFriendship(id);
+                  await data.deleteFriendship(id);
-                    if (!mounted) return;
+                  if (!mounted) return;
-                    setState(() => _friendship = status.copyWith(status: 'none'));
+                  setState(() => _friendship = status.copyWith(status: 'none'));
-                  }),
+                }),
           icon: const Icon(Icons.person_remove),
           label: const Text('Unfriend'),
         ),
@@ -416,17 +431,14 @@ class _UserProfilePageState extends State<UserProfilePage> {
 
     if (buttons.isEmpty) return const SizedBox.shrink();
 
-    return Wrap(
+    return Wrap(spacing: 8, runSpacing: 8, children: buttons);
-      spacing: 8,
-      runSpacing: 8,
-      children: buttons,
-    );
   }
 
   @override
   Widget build(BuildContext context) {
     final auth = context.watch<AuthService>();
     final theme = Theme.of(context);
+    final canEdit = auth.userId != null && auth.userId == _userId;
     return Scaffold(
       appBar: AppBar(
         title: const Text('User profile'),
@@ -455,10 +467,7 @@ class _UserProfilePageState extends State<UserProfilePage> {
                     Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
-                        Text(
+                        Text('Entries', style: theme.textTheme.titleMedium),
-                          'Entries',
-                          style: theme.textTheme.titleMedium,
-                        ),
                         if (_loading)
                           const SizedBox(
                             width: 16,
@@ -478,13 +487,17 @@ class _UserProfilePageState extends State<UserProfilePage> {
                     else if (_legs.isEmpty)
                       Text(
                         (_profile?.privacyInfo.isNotEmpty ?? false)
-                            ? 'Legs hidden due to privacy settings.'
+                            ? 'Hidden due to privacy settings.'
                             : 'No entries found.',
                       )
                     else ...[
-                      ..._buildLegsWithDividers(context, _legs),
+                      ..._buildLegsWithDividers(
+                        context,
+                        _legs,
+                        showEditButton: canEdit,
+                      ),
                       const SizedBox(height: 8),
-                      if (_hasMore || _loadingMore)
+                      if ((_hasMore || _loadingMore) && _legs.isNotEmpty)
                         Align(
                           alignment: Alignment.center,
                           child: OutlinedButton.icon(
@@ -493,8 +506,9 @@ class _UserProfilePageState extends State<UserProfilePage> {
                                 ? const SizedBox(
                                     height: 14,
                                     width: 14,
-                                    child:
+                                    child: CircularProgressIndicator(
-                                        CircularProgressIndicator(strokeWidth: 2),
+                                      strokeWidth: 2,
+                                    ),
                                   )
                                 : const Icon(Icons.expand_more),
                             label: Text(

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(
@@ -465,7 +482,7 @@ class _ProfilePageState extends State<ProfilePage> {
                     subtitle:
                         user.username.isNotEmpty ? Text('@${user.username}') : null,
                   trailing: TextButton(
-                    onPressed: () => context.goNamed(
+                    onPressed: () => context.pushNamed(
                       'user-profile',
                       extra: user,
                       queryParameters: {'user_id': user.userId},
@@ -745,16 +762,26 @@ class _ProfilePageState extends State<ProfilePage> {
                 subtitle: otherUser?.username.isNotEmpty == true
                     ? Text('@${otherUser!.username}')
                     : null,
-                trailing: TextButton(
+                  trailing: TextButton(
-                  onPressed: () {
+                    onPressed: () {
-                    final user = otherUser;
+                      final user = otherUser;
-                    if (user != null) {
+                      if (user != null) {
-                      _loadStatus(user);
+                        final auth = context.read<AuthService>();
-                    }
+                        final isSelf = auth.userId == user.userId;
-                  },
+                        if (isSelf) {
-                  child: const Text('Manage'),
+                          context.go('/more/profile');
-                ),
+                        } else {
-              ),
+                          context.pushNamed(
+                            'user-profile',
+                            extra: user,
+                            queryParameters: {'user_id': user.userId},
+                          );
+                        }
+                      }
+                    },
+                    child: const Text('View'),
+                  ),
+                  ),
             );
           }),
       ],

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,26 @@
 part of 'traction.dart';
 
+enum _TractionMoreAction {
+  classStats,
+  classLeaderboard,
+  adminPending,
+}
+
 class TractionPage extends StatefulWidget {
   const TractionPage({
     super.key,
     this.selectionMode = false,
+    this.selectionSingle = false,
+    this.replacementPendingLocoId,
+    this.transferFromLocoId,
     this.onSelect,
     this.selectedKeys = const {},
   });
 
   final bool selectionMode;
+  final bool selectionSingle;
+  final int? replacementPendingLocoId;
+  final int? transferFromLocoId;
   final ValueChanged<LocoSummary>? onSelect;
   final Set<String> selectedKeys;
 
@@ -23,6 +35,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;
@@ -33,6 +46,14 @@ class _TractionPageState extends State<TractionPage> {
   String? _classStatsError;
   String? _classStatsForClass;
   Map<String, dynamic>? _classStats;
+  bool _showClassLeaderboardPanel = false;
+  bool _classLeaderboardLoading = false;
+  String? _classLeaderboardError;
+  String? _classLeaderboardForClass;
+  String? _classFriendsLeaderboardForClass;
+  List<LeaderboardEntry> _classLeaderboard = [];
+  List<LeaderboardEntry> _classFriendsLeaderboard = [];
+  _ClassLeaderboardScope _classLeaderboardScope = _ClassLeaderboardScope.global;
 
   final Map<String, TextEditingController> _dynamicControllers = {};
   final Map<String, String?> _enumSelections = {};
@@ -211,6 +232,13 @@ class _TractionPageState extends State<TractionPage> {
       _classStats = null;
       _classStatsError = null;
       _classStatsForClass = null;
+      _showClassLeaderboardPanel = false;
+      _classLeaderboard = [];
+      _classFriendsLeaderboard = [];
+      _classLeaderboardError = null;
+      _classLeaderboardForClass = null;
+      _classFriendsLeaderboardForClass = null;
+      _classLeaderboardScope = _ClassLeaderboardScope.global;
     });
     _refreshTraction();
   }
@@ -223,6 +251,7 @@ class _TractionPageState extends State<TractionPage> {
       });
     }
     _refreshClassStatsIfOpen();
+    _refreshClassLeaderboardIfOpen();
   }
 
   List<EventField> _activeEventFields(List<EventField> fields) {
@@ -405,6 +434,7 @@ class _TractionPageState extends State<TractionPage> {
                             });
                             _refreshTraction();
                             _refreshClassStatsIfOpen(immediate: true);
+                            _refreshClassLeaderboardIfOpen(immediate: true);
                           },
                         ),
                       ),
@@ -518,6 +548,19 @@ class _TractionPageState extends State<TractionPage> {
           ),
         ),
       ),
+      SliverPadding(
+        padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
+        sliver: SliverToBoxAdapter(
+          child: AnimatedCrossFade(
+            crossFadeState: (_showClassLeaderboardPanel && _hasClassQuery)
+                ? CrossFadeState.showFirst
+                : CrossFadeState.showSecond,
+            duration: const Duration(milliseconds: 200),
+            firstChild: _buildClassLeaderboardCard(context),
+            secondChild: const SizedBox.shrink(),
+          ),
+        ),
+      ),
       SliverPadding(
         padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
         sliver: _buildTractionSliver(context, data, traction),
@@ -576,47 +619,106 @@ class _TractionPageState extends State<TractionPage> {
       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 newTractionButton = !isElevated
+    final newTractionButton = FilledButton.icon(
+      onPressed: () async {
+        final createdClass = await context.push<String>(
+          '/traction/new',
+        );
+        if (!mounted) return;
+        if (createdClass != null && createdClass.isNotEmpty) {
+          _classController.text = createdClass;
+          _selectedClass = createdClass;
+          _refreshTraction();
+        } else if (createdClass == '') {
+          _refreshTraction();
+        }
+      },
+      icon: const Icon(Icons.add),
+      label: const Text('New Traction'),
+    );
+
+    final hasAdminActions = isElevated;
+    final hasMoreMenu = hasClassActions || hasAdminActions;
+
+    final moreButton = !hasMoreMenu
         ? null
-        : FilledButton.icon(
+        : PopupMenuButton<_TractionMoreAction>(
-            onPressed: () async {
+            tooltip: 'More options',
-              final createdClass = await context.push<String>(
+            onSelected: (action) async {
-                '/traction/new',
+              switch (action) {
-              );
+                case _TractionMoreAction.classStats:
-              if (!mounted) return;
+                  _toggleClassStatsPanel();
-              if (createdClass != null && createdClass.isNotEmpty) {
+                  break;
-                _classController.text = createdClass;
+                case _TractionMoreAction.classLeaderboard:
-                _selectedClass = createdClass;
+                  _toggleClassLeaderboardPanel();
-                _refreshTraction();
+                  break;
-              } else if (createdClass == '') {
+                case _TractionMoreAction.adminPending:
-                _refreshTraction();
+                  final messenger = ScaffoldMessenger.of(context);
+                  try {
+                    await context.push('/traction/pending');
+                    if (!mounted) return;
+                  } catch (_) {
+                    if (!mounted) return;
+                    messenger.showSnackBar(
+                      const SnackBar(
+                        content: Text('Unable to open pending locos'),
+                      ),
+                    );
+                  }
+                  break;
               }
             },
-            icon: const Icon(Icons.add),
+            itemBuilder: (context) {
-            label: const Text('New Traction'),
+              final items = <PopupMenuEntry<_TractionMoreAction>>[];
+              if (hasClassActions) {
+                items.add(
+                  const PopupMenuItem(
+                    value: _TractionMoreAction.classStats,
+                    child: Text('Class stats'),
+                  ),
+                );
+              }
+              if (hasClassActions) {
+                items.add(
+                  const PopupMenuItem(
+                    value: _TractionMoreAction.classLeaderboard,
+                    child: Text('Class leaderboard'),
+                  ),
+                );
+              }
+              if (items.isNotEmpty && hasAdminActions) {
+                items.add(const PopupMenuDivider());
+              }
+              if (hasAdminActions) {
+                items.add(
+                  const PopupMenuItem(
+                    value: _TractionMoreAction.adminPending,
+                    child: Text('Pending locos'),
+                  ),
+                );
+              }
+              return items;
+            },
+            child: IgnorePointer(
+              child: FilledButton.tonalIcon(
+                onPressed: () {},
+                icon: const Icon(Icons.more_horiz),
+                label: const Text('More'),
+              ),
+            ),
           );
 
     final desktopActions = [
       refreshButton,
-      if (classStatsButton != null) classStatsButton,
+      newTractionButton,
-      if (newTractionButton != null) newTractionButton,
+      if (moreButton != null) moreButton,
     ];
 
     final mobileActions = [
-      if (newTractionButton != null) newTractionButton,
+      if (moreButton != null) moreButton,
-      if (classStatsButton != null) classStatsButton,
+      newTractionButton,
       refreshButton,
     ];
 
@@ -944,6 +1046,42 @@ class _TractionPageState extends State<TractionPage> {
     return total;
   }
 
+  Widget _placementBadge(BuildContext context, int index) {
+    const size = 32.0;
+    const iconSize = 18.0;
+    if (index == 0) {
+      return CircleAvatar(
+        radius: size / 2,
+        backgroundColor: Colors.amber.shade400,
+        child: const Icon(Icons.emoji_events, color: Colors.white, size: iconSize),
+      );
+    }
+    if (index == 1) {
+      return CircleAvatar(
+        radius: size / 2,
+        backgroundColor: Colors.blueGrey.shade200,
+        child: const Icon(Icons.emoji_events, color: Colors.white, size: iconSize),
+      );
+    }
+    if (index == 2) {
+      return CircleAvatar(
+        radius: size / 2,
+        backgroundColor: Colors.brown.shade300,
+        child: const Icon(Icons.emoji_events, color: Colors.white, size: iconSize),
+      );
+    }
+    return CircleAvatar(
+      radius: size / 2,
+      backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
+      child: Text(
+        '${index + 1}',
+        style: Theme.of(context).textTheme.labelLarge?.copyWith(
+              fontWeight: FontWeight.w800,
+            ),
+      ),
+    );
+  }
+
   Color _statusColor(String status, ColorScheme scheme) {
     final key = status.toLowerCase();
     if (key.contains('scrap')) return Colors.red.shade600;
@@ -975,6 +1113,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);
@@ -984,6 +1128,128 @@ 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 confirmed = await showDialog<bool>(
+      context: navContext,
+      builder: (dialogContext) {
+        return AlertDialog(
+          title: const Text('Transfer allocations?'),
+          content: Text(
+            'Transfer all allocations from this loco to ${target.locoClass} ${target.number}?',
+          ),
+          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);
@@ -1116,16 +1382,34 @@ class _TractionPageState extends State<TractionPage> {
         (context, index) {
           if (index < traction.length) {
             final loco = traction[index];
-            return TractionCard(
+              return TractionCard(
-              loco: loco,
+                loco: loco,
-              selectionMode: widget.selectionMode,
+                selectionMode: widget.selectionMode,
-              isSelected: _isSelected(loco),
+                isSelected: _isSelected(loco),
-              onShowInfo: () => showTractionDetails(context, loco),
+                onShowInfo: () => showTractionDetails(
-              onOpenTimeline: () => _openTimeline(loco),
+                  context,
-              onOpenLegs: () => _openLegs(loco),
+                  loco,
-              onToggleSelect:
+                  onActionComplete: () => _refreshTraction(preservePosition: true),
-                  widget.selectionMode ? () => _toggleSelection(loco) : null,
+                ),
-            );
+                onOpenTimeline: () => _openTimeline(loco),
+                onOpenLegs: () => _openLegs(loco),
+                onActionComplete: _refreshTraction,
+                onToggleSelect: widget.selectionMode &&
+                        widget.replacementPendingLocoId == null
+                    ? () => _toggleSelection(loco)
+                    : null,
+                onReplacePending: widget.selectionMode &&
+                        widget.selectionSingle &&
+                        widget.replacementPendingLocoId != null
+                    ? () => _confirmReplacePending(loco)
+                    : null,
+                onTransferAllocations: widget.selectionMode &&
+                        widget.selectionSingle &&
+                        widget.transferFromLocoId != null &&
+                        widget.transferFromLocoId != loco.id
+                    ? () => _confirmTransfer(loco)
+                    : null,
+              );
           }
 
           return Padding(
@@ -1150,4 +1434,212 @@ class _TractionPageState extends State<TractionPage> {
       ),
     );
   }
+
+  Future<void> _toggleClassLeaderboardPanel() async {
+    if (!_hasClassQuery) return;
+    final targetState = !_showClassLeaderboardPanel;
+    setState(() {
+      _showClassLeaderboardPanel = targetState;
+    });
+    if (targetState) {
+      await _loadClassLeaderboard(friends: _classLeaderboardScope == _ClassLeaderboardScope.friends);
+    }
+  }
+
+  void _refreshClassLeaderboardIfOpen({bool immediate = false}) {
+    if (!_showClassLeaderboardPanel || !_hasClassQuery) return;
+    final query = (_selectedClass ?? _classController.text).trim();
+    final scope = _classLeaderboardScope;
+    final currentData = scope == _ClassLeaderboardScope.global
+        ? _classLeaderboard
+        : _classFriendsLeaderboard;
+    final currentClass = scope == _ClassLeaderboardScope.global
+        ? _classLeaderboardForClass
+        : _classFriendsLeaderboardForClass;
+    if (!immediate && currentClass == query && currentData.isNotEmpty) {
+      return;
+    }
+    _loadClassLeaderboard(
+      friends: scope == _ClassLeaderboardScope.friends,
+    );
+  }
+
+  Future<void> _loadClassLeaderboard({required bool friends}) async {
+    final query = (_selectedClass ?? _classController.text).trim();
+    if (query.isEmpty) return;
+    final currentClass = friends ? _classFriendsLeaderboardForClass : _classLeaderboardForClass;
+    final currentData = friends ? _classFriendsLeaderboard : _classLeaderboard;
+    if (currentClass == query && currentData.isNotEmpty) return;
+    setState(() {
+      _classLeaderboardLoading = true;
+      _classLeaderboardError = null;
+      if (friends && _classFriendsLeaderboardForClass != query) {
+        _classFriendsLeaderboard = [];
+      } else if (!friends && _classLeaderboardForClass != query) {
+        _classLeaderboard = [];
+      }
+    });
+    try {
+      final data = context.read<DataService>();
+      final leaderboard = await data.fetchClassLeaderboard(
+        query,
+        friends: friends,
+      );
+      if (!mounted) return;
+      setState(() {
+        if (friends) {
+          _classFriendsLeaderboard = leaderboard;
+          _classFriendsLeaderboardForClass = query;
+        } else {
+          _classLeaderboard = leaderboard;
+          _classLeaderboardForClass = query;
+        }
+        _classLeaderboardError = null;
+      });
+    } catch (e) {
+      if (!mounted) return;
+      setState(() {
+        _classLeaderboardError = 'Failed to load class leaderboard: $e';
+      });
+    } finally {
+      if (mounted) {
+        setState(() {
+          _classLeaderboardLoading = false;
+        });
+      }
+    }
+  }
+
+  Widget _buildClassLeaderboardCard(BuildContext context) {
+    final scheme = Theme.of(context).colorScheme;
+    final distanceUnits = context.watch<DistanceUnitService>();
+    final leaderboard = _classLeaderboardScope == _ClassLeaderboardScope.global
+        ? _classLeaderboard
+        : _classFriendsLeaderboard;
+    final loading = _classLeaderboardLoading;
+    final error = _classLeaderboardError;
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Expanded(
+                  child: Text(
+                    (_selectedClass ?? _classController.text).trim().isEmpty
+                        ? 'Class leaderboard'
+                        : '${(_selectedClass ?? _classController.text).trim()} leaderboard',
+                    style: Theme.of(context).textTheme.titleMedium,
+                  ),
+                ),
+                SegmentedButton<_ClassLeaderboardScope>(
+                  segments: const [
+                    ButtonSegment(
+                      value: _ClassLeaderboardScope.global,
+                      label: Text('Global'),
+                    ),
+                    ButtonSegment(
+                      value: _ClassLeaderboardScope.friends,
+                      label: Text('Friends'),
+                    ),
+                  ],
+                  selected: {_classLeaderboardScope},
+                  onSelectionChanged: (vals) async {
+                    if (vals.isEmpty) return;
+                    final selected = vals.first;
+                    setState(() => _classLeaderboardScope = selected);
+                    if (selected == _ClassLeaderboardScope.friends &&
+                        _classFriendsLeaderboard.isEmpty &&
+                        !_classLeaderboardLoading) {
+                      await _loadClassLeaderboard(friends: true);
+                    } else if (selected == _ClassLeaderboardScope.global &&
+                        _classLeaderboard.isEmpty &&
+                        !_classLeaderboardLoading) {
+                      await _loadClassLeaderboard(friends: false);
+                    }
+                  },
+                  style: SegmentedButton.styleFrom(
+                    visualDensity: VisualDensity.compact,
+                    padding: const EdgeInsets.symmetric(horizontal: 8),
+                  ),
+                ),
+                const SizedBox(width: 8),
+                IconButton(
+                  tooltip: 'Refresh leaderboard',
+                  icon: const Icon(Icons.refresh),
+                  onPressed: () => _loadClassLeaderboard(
+                    friends: _classLeaderboardScope == _ClassLeaderboardScope.friends,
+                  ),
+                ),
+              ],
+            ),
+            const SizedBox(height: 12),
+            if (loading)
+              Row(
+                children: const [
+                  SizedBox(
+                    height: 16,
+                    width: 16,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  ),
+                  SizedBox(width: 12),
+                  Text('Loading leaderboard...'),
+                ],
+              )
+            else if (error != null)
+              Text(
+                error,
+                style: TextStyle(color: scheme.error),
+              )
+            else if (leaderboard.isEmpty)
+              const Text('No leaderboard data yet.')
+            else
+              Column(
+                children: [
+                  for (int i = 0; i < leaderboard.length; i++) ...[
+                    ListTile(
+                      contentPadding: EdgeInsets.zero,
+                      dense: true,
+                      leading: _placementBadge(context, i),
+                      title: Text(
+                        leaderboard[i].userFullName,
+                        style: Theme.of(context).textTheme.titleSmall?.copyWith(
+                              fontWeight: FontWeight.w700,
+                            ),
+                      ),
+                      trailing: Text(
+                        distanceUnits.format(
+                          leaderboard[i].mileage,
+                          decimals: 1,
+                        ),
+                        style: Theme.of(context).textTheme.labelLarge?.copyWith(
+                              fontWeight: FontWeight.w700,
+                            ),
+                      ),
+                      onTap: () {
+                        final auth = context.read<AuthService>();
+                        final userId = leaderboard[i].userId;
+                        if (auth.userId == userId) {
+                          context.go('/more/profile');
+                        } else {
+                          context.pushNamed(
+                            'user-profile',
+                            queryParameters: {'user_id': userId},
+                          );
+                        }
+                      },
+                    ),
+                    if (i != leaderboard.length - 1) const Divider(height: 12),
+                  ],
+                ],
+              ),
+          ],
+        ),
+      ),
+    );
+  }
 }
+
+enum _ClassLeaderboardScope { global, friends }

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,10 +84,42 @@ class TractionCard extends StatelessWidget {
                       ),
                   ],
                 ),
-                Chip(
+                Row(
-                  label: Text(status),
+                  mainAxisSize: MainAxisSize.min,
-                  backgroundColor: statusColors.$1,
+                  children: [
-                  labelStyle: TextStyle(color: statusColors.$2),
+                    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,
+                      labelStyle: TextStyle(color: statusColors.$2),
+                    ),
+                  ],
                 ),
               ],
             ),
@@ -108,17 +146,31 @@ class TractionCard extends StatelessWidget {
                     ),
                 ];
 
-                final addButton = selectionMode && onToggleSelect != null
+                // Prefer replace action when picking a replacement loco.
+                final addButton = onTransferAllocations != null
                     ? TextButton.icon(
-                        onPressed: onToggleSelect,
+                        onPressed: onTransferAllocations,
-                        icon: Icon(
+                        icon: const Icon(Icons.swap_horiz),
-                          isSelected
+                        label: const Text('Transfer'),
-                              ? Icons.remove_circle_outline
-                              : Icons.add_circle_outline,
-                        ),
-                        label: Text(isSelected ? 'Remove' : 'Add to entry'),
                       )
-                    : null;
+                    : 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(
+                                  isSelected
+                                      ? Icons.remove_circle_outline
+                                      : Icons.add_circle_outline,
+                                ),
+                                label:
+                                    Text(isSelected ? 'Remove' : 'Add to entry'),
+                              )
+                            : null;
 
                 if (isNarrow) {
                   return Column(
@@ -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>[])
@@ -227,11 +593,11 @@ Future<void> showTractionDetails(
         builder: (_, controller) {
           return Padding(
             padding: const EdgeInsets.all(16.0),
-            child: Column(
+          child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
+            crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
+            children: [
-                Row(
+              Row(
-                  children: [
+                children: [
                     IconButton(
                       icon: const Icon(Icons.close),
                       onPressed: () => Navigator.of(ctx).pop(),
@@ -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,
@@ -274,11 +630,41 @@ Future<void> showTractionDetails(
                       style: Theme.of(context).textTheme.bodyMedium,
                     ),
                   ),
-                const SizedBox(height: 4),
+              const SizedBox(height: 4),
-                Expanded(
+              Expanded(
-                  child: ListView(
+                child: ListView(
-                    controller: controller,
+                  controller: controller,
-                    children: [
+                  children: [
+                      FilledButton.icon(
+                        onPressed: () {
+                          Navigator.of(ctx).pop();
+                          navContext.push(
+                            Uri(
+                              path: '/traction',
+                              queryParameters: {
+                                'selection': 'single',
+                                'transferFromLocoId': loco.id.toString(),
+                              },
+                            ).toString(),
+                            extra: {
+                              'selection': 'single',
+                              'transferFromLocoId': loco.id,
+                            },
+                          );
+                        },
+                        icon: const Icon(Icons.swap_horiz),
+                        label: const Text('Transfer allocations'),
+                      ),
+                      const SizedBox(height: 12),
+                    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 ?? ''),
@@ -355,12 +741,100 @@ Future<void> showTractionDetails(
                                 distanceUnits,
                               );
                             }).toList(),
-                          );
+                      );
-                        },
+                    },
-                      ),
-                    ],
                   ),
-                ),
+                  const SizedBox(height: 16),
+                  FilledButton.icon(
+                    onPressed: () {
+                      Navigator.of(ctx).pop();
+                      navContext.push(
+                        Uri(
+                          path: '/traction',
+                          queryParameters: {
+                            'selection': 'single',
+                            'transferFromLocoId': loco.id.toString(),
+                          },
+                        ).toString(),
+                        extra: {
+                          'selection': 'single',
+                          'transferFromLocoId': loco.id,
+                        },
+                      );
+                    },
+                    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

@@ -0,0 +1,533 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:provider/provider.dart';
+
+class LegShareEditNotificationCard extends StatefulWidget {
+  const LegShareEditNotificationCard({super.key, required this.notification});
+
+  final UserNotification notification;
+
+  @override
+  State<LegShareEditNotificationCard> createState() => _LegShareEditNotificationCardState();
+}
+
+class _LegShareEditNotificationCardState extends State<LegShareEditNotificationCard> {
+  Map<String, dynamic>? _changes;
+  int? _legId;
+  int? _shareId;
+  Leg? _currentLeg;
+  bool _loading = false;
+
+  static const int _summaryLimit = 3;
+
+  @override
+  void initState() {
+    super.initState();
+    _parseNotification();
+  }
+
+  @override
+  void didUpdateWidget(covariant LegShareEditNotificationCard oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.notification != widget.notification) {
+      _parseNotification();
+    }
+  }
+
+  void _parseNotification() {
+    final rawBody = widget.notification.body.trim();
+
+    // Reset
+    _shareId = null;
+    _legId = null;
+    _currentLeg = null;
+    _changes = null;
+
+    final parsed = _decodeBody(rawBody);
+    if (parsed != null) {
+      _shareId = _parseInt(parsed['share_id']);
+      _legId = _parseInt(parsed['leg_id']);
+      final accepted = _asStringKeyedMap(parsed['accepted_changes']);
+      if (accepted != null) {
+        _changes = accepted;
+      }
+    }
+
+    // Fallback: extract share_id from raw string if still missing.
+    _shareId ??= _extractShareId(rawBody);
+  }
+
+  int? _parseInt(dynamic value) {
+    if (value is int) return value;
+    if (value is num) return value.toInt();
+    if (value is String) return int.tryParse(value.trim());
+    return null;
+  }
+
+  Map<String, dynamic>? _decodeBody(String rawBody) {
+    final attempts = <String>[
+      rawBody,
+      _stripWrappingQuotes(rawBody),
+      _replaceSingleQuotes(rawBody),
+    ].where((s) => s.trim().isNotEmpty).toSet();
+
+    for (final attempt in attempts) {
+      final parsed = _decodeJsonToMap(attempt);
+      if (parsed != null) return parsed;
+    }
+    return null;
+  }
+
+  Map<String, dynamic>? _decodeJsonToMap(String source) {
+    dynamic parsed = source;
+    for (int i = 0; i < 3 && parsed is String; i++) {
+      try {
+        parsed = jsonDecode(parsed);
+      } catch (e) {
+        parsed = null;
+        break;
+      }
+    }
+    if (parsed is Map) {
+      final map = parsed.map((k, v) => MapEntry(k.toString(), v));
+      return map;
+    }
+    return null;
+  }
+
+  String _stripWrappingQuotes(String input) {
+    final trimmed = input.trim();
+    if (trimmed.length >= 2 &&
+        ((trimmed.startsWith('"') && trimmed.endsWith('"')) ||
+            (trimmed.startsWith("'") && trimmed.endsWith("'")))) {
+      return trimmed.substring(1, trimmed.length - 1);
+    }
+    return input;
+  }
+
+  String _replaceSingleQuotes(String input) {
+    if (!input.contains("'")) return input;
+    return input.replaceAll(RegExp(r"(?<!\\)'"), '"');
+  }
+
+  Map<String, dynamic>? _asStringKeyedMap(dynamic value) {
+    if (value is Map) {
+      return value.map((k, v) => MapEntry(k.toString(), v));
+    }
+    if (value is String && value.trim().isNotEmpty) {
+      for (final attempt in [value, _replaceSingleQuotes(value)]) {
+        try {
+          final decoded = jsonDecode(attempt);
+          if (decoded is Map) {
+            return decoded.map((k, v) => MapEntry(k.toString(), v));
+          }
+        } catch (_) {
+          // Ignore; handled by caller.
+        }
+      }
+    }
+    return null;
+  }
+
+  int? _extractShareId(String raw) {
+    final patterns = [
+      RegExp(r'"share_id"\s*:\s*(\d+)'),
+      RegExp(r"'share_id'\s*:\s*(\d+)"),
+      RegExp(r'share_id\s*:\s*(\d+)'),
+      RegExp(r'"share_id"\s*:\s*"(\d+)"'),
+    ];
+    for (final pattern in patterns) {
+      final match = pattern.firstMatch(raw);
+      if (match != null) {
+        final parsed = int.tryParse(match.group(1)!);
+        return parsed;
+      }
+    }
+    return null;
+  }
+
+  Future<void> _loadLegIdIfNeeded() async {
+    if (_legId != null) return;
+    if (_shareId == null) {
+      return;
+    }
+    try {
+      final share = await context.read<DataService>().fetchLegShare(_shareId!.toString());
+      if (!mounted) return;
+      _legId = share?.entry.id;
+      _currentLeg ??= _findCurrentLeg(_legId);
+    } catch (e) {
+      // ignore: avoid_empty_catches
+    }
+  }
+
+  Leg? _findCurrentLeg(int? legId) {
+    if (legId == null) return null;
+    final data = context.read<DataService>();
+    try {
+      return data.legs.firstWhere((l) => l.id == legId);
+    } catch (_) {
+      return null;
+    }
+  }
+
+
+  @override
+  Widget build(BuildContext context) {
+    final changes = _changes;
+    if (changes == null || changes.isEmpty) {
+      return const Text('No changes supplied.');
+    }
+    final entries = changes.entries.toList();
+    final shown = entries.take(_summaryLimit).toList();
+    final remaining = entries.length - shown.length;
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        ...shown.map((e) => _changePreview(context, e)),
+        if (remaining > 0)
+          Padding(
+            padding: const EdgeInsets.only(top: 4.0),
+            child: Text('+$remaining others…', style: Theme.of(context).textTheme.bodySmall),
+          ),
+        const SizedBox(height: 8),
+        Wrap(
+          spacing: 8,
+          runSpacing: 8,
+          children: [
+            ElevatedButton(
+              onPressed: _loading ? null : () => _openDrawer(changes),
+              child: const Text('View changes'),
+            ),
+            TextButton(
+              onPressed: _loading ? null : _dismiss,
+              child: const Text('Dismiss changes'),
+            ),
+          ],
+        ),
+      ],
+    );
+  }
+
+  Widget _changePreview(BuildContext context, MapEntry<String, dynamic> change) {
+    final key = _prettyField(change.key);
+    final value = change.value;
+    String display;
+    if (change.key == 'locos' && value is List) {
+      display = '${value.length} traction update${value.length == 1 ? '' : 's'}';
+    } else {
+      display = _stringify(value);
+    }
+    return Padding(
+      padding: const EdgeInsets.only(top: 4.0),
+      child: Text('$key: $display'),
+    );
+  }
+
+  String _prettyField(String raw) {
+    switch (raw) {
+      case 'leg_notes':
+        return 'Notes';
+      case 'locos':
+        return 'Traction';
+      default:
+        return raw.replaceAll('_', ' ');
+    }
+  }
+
+  dynamic _currentValueForField(Leg leg, String key) {
+    switch (key) {
+      case 'leg_begin_time':
+        return leg.beginTime;
+      case 'leg_end_time':
+        return leg.endTime;
+      case 'leg_origin_time':
+        return leg.originTime;
+      case 'leg_destination_time':
+        return leg.destinationTime;
+      case 'leg_notes':
+        return leg.notes;
+      case 'leg_headcode':
+        return leg.headcode;
+      case 'leg_network':
+        return leg.network;
+      case 'leg_start':
+        return leg.start;
+      case 'leg_end':
+        return leg.end;
+      case 'leg_origin':
+        return leg.origin;
+      case 'leg_destination':
+        return leg.destination;
+      case 'leg_route':
+        return leg.route;
+      case 'leg_mileage':
+        return leg.mileage;
+      case 'leg_begin_delay':
+        return leg.beginDelayMinutes;
+      case 'leg_end_delay':
+        return leg.endDelayMinutes;
+      case 'locos':
+        return leg.locos;
+      default:
+        return null;
+    }
+  }
+
+  Widget _buildChangeValueWidget(
+    String key,
+    dynamic newValue,
+    Leg? currentLeg,
+    Widget Function(List<dynamic>) buildLocos,
+  ) {
+    final currentValue = currentLeg == null ? null : _currentValueForField(currentLeg, key);
+    if (key == 'locos' && newValue is List) {
+      final currentCount = (currentValue is List) ? currentValue.length : 0;
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text('Current: $currentCount locos'),
+          const SizedBox(height: 4),
+          const Text('New:'),
+          buildLocos(newValue),
+        ],
+      );
+    }
+
+    final currentStr = _stringify(currentValue);
+    final newStr = _stringify(newValue);
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Expanded(child: Text(currentStr, maxLines: 3, overflow: TextOverflow.ellipsis)),
+        const Padding(
+          padding: EdgeInsets.symmetric(horizontal: 6.0),
+          child: Icon(Icons.arrow_right_alt, size: 18),
+        ),
+        Expanded(child: Text(newStr, maxLines: 3, overflow: TextOverflow.ellipsis)),
+      ],
+    );
+  }
+
+  String _stringify(dynamic value) {
+    if (value is DateTime) return value.toIso8601String();
+    if (value == null) return '—';
+    if (value is List || value is Map) {
+      return jsonEncode(value);
+    }
+    return value.toString();
+  }
+
+  Future<void> _openDrawer(Map<String, dynamic> changes) async {
+    setState(() => _loading = true);
+    await _loadLegIdIfNeeded();
+    _currentLeg ??= _findCurrentLeg(_legId);
+    if (!mounted) return;
+    setState(() => _loading = false);
+    final legId = _legId;
+    if (legId == null) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Unable to load shared leg.')),
+      );
+      return;
+    }
+
+    final selected = Map<String, bool>.fromEntries(
+      changes.keys.map((k) => MapEntry(k, false)),
+    );
+
+    await showModalBottomSheet<void>(
+      context: context,
+      isScrollControlled: true,
+      builder: (ctx) {
+        return StatefulBuilder(
+          builder: (context, setSheetState) {
+            Future<void> apply() async {
+              final payload = <String, dynamic>{};
+              for (final entry in changes.entries) {
+                if (selected[entry.key] == true) {
+                  payload[entry.key] = entry.value;
+                }
+              }
+              if (payload.isEmpty) {
+                Navigator.of(context).pop();
+                return;
+              }
+              final messenger = ScaffoldMessenger.of(context);
+              setSheetState(() => _loading = true);
+              try {
+                final data = context.read<DataService>();
+                await data.applyLegPartialUpdates(
+                  legId: legId,
+                  updates: payload,
+                );
+                if (!context.mounted) return;
+                await data.dismissNotifications([widget.notification.id]);
+                if (!context.mounted) return;
+                messenger.showSnackBar(
+                  const SnackBar(content: Text('Changes applied.')),
+                );
+                Navigator.of(context).pop();
+              } catch (e) {
+                messenger.showSnackBar(
+                  SnackBar(content: Text('Failed to apply changes: $e')),
+                );
+              } finally {
+                setSheetState(() => _loading = false);
+              }
+            }
+
+            Widget buildLocos(List<dynamic> locos) {
+              final parsed = locos
+                  .whereType<Map>()
+                  .map((e) => e.map((k, v) => MapEntry(k.toString(), v)))
+                  .toList();
+              parsed.sort((a, b) => (b['alloc_pos'] ?? 0).compareTo(a['alloc_pos'] ?? 0));
+              final leading = parsed.where((e) => (e['alloc_pos'] ?? 0) > 0).toList();
+              final trailing = parsed.where((e) => (e['alloc_pos'] ?? 0) <= 0).toList();
+
+              List<Widget> chipsFor(List<Map<String, dynamic>> list) {
+                return list
+                    .map(
+                      (loco) => Chip(
+                        backgroundColor:
+                            (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'] ?? '?'}'),
+                        avatar: Icon(
+                          Icons.train,
+                          size: 16,
+                          color: (loco['alloc_powering'] == 1 || loco['alloc_powering'] == true)
+                              ? Theme.of(context).colorScheme.primary
+                              : Theme.of(context).hintColor,
+                        ),
+                      ),
+                    )
+                    .toList();
+              }
+
+              return Wrap(
+                spacing: 8,
+                runSpacing: 8,
+                crossAxisAlignment: WrapCrossAlignment.center,
+                children: [
+                  ...chipsFor(leading),
+                  if (leading.isNotEmpty && trailing.isNotEmpty)
+                    const SizedBox(
+                      width: 24,
+                      child: Center(child: Divider(height: 16)),
+                    ),
+                  ...chipsFor(trailing),
+                ],
+              );
+            }
+
+            return SafeArea(
+              child: Padding(
+                padding: EdgeInsets.only(
+                  left: 16,
+                  right: 16,
+                  bottom: MediaQuery.of(context).viewInsets.bottom + 16,
+                  top: 16,
+                ),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Text('Review changes', style: Theme.of(context).textTheme.titleMedium),
+                        IconButton(
+                          icon: const Icon(Icons.close),
+                          onPressed: () => Navigator.of(context).pop(),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 12),
+                    Row(
+                      children: [
+                        TextButton(
+                          onPressed: () => setSheetState(() {
+                            for (final key in selected.keys) {
+                              selected[key] = true;
+                            }
+                          }),
+                          child: const Text('Select all'),
+                        ),
+                        const Spacer(),
+                        TextButton(
+                          onPressed: () => Navigator.of(context).pop(),
+                          child: const Text('Cancel'),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 8),
+                    ...changes.entries.map((entry) {
+                      final key = entry.key;
+                      final prettyKey = _prettyField(key);
+                      final value = entry.value;
+                      final currentLeg = _currentLeg ?? _findCurrentLeg(_legId);
+                      final valueWidget = _buildChangeValueWidget(
+                        key,
+                        value,
+                        currentLeg,
+                        buildLocos,
+                      );
+                      return Padding(
+                        padding: const EdgeInsets.only(bottom: 12.0),
+                        child: Row(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Checkbox(
+                              value: selected[key] ?? false,
+                              onChanged: (v) => setSheetState(() {
+                                selected[key] = v ?? false;
+                              }),
+                            ),
+                            Expanded(
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Text(prettyKey, style: Theme.of(context).textTheme.titleSmall),
+                                  const SizedBox(height: 4),
+                                  valueWidget,
+                                ],
+                              ),
+                            ),
+                          ],
+                        ),
+                      );
+                    }),
+                    Align(
+                      alignment: Alignment.centerRight,
+                      child: FilledButton(
+                        onPressed: _loading ? null : apply,
+                        child: _loading
+                            ? const SizedBox(
+                                height: 18,
+                                width: 18,
+                                child: CircularProgressIndicator(strokeWidth: 2),
+                              )
+                            : const Text('Apply changes'),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+
+  Future<void> _dismiss() async {
+    await context.read<DataService>().dismissNotifications([widget.notification.id]);
+  }
+}

lib/components/widgets/leg_share_notification_card.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
@@ -14,8 +15,8 @@ class LegShareNotificationCard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final data = context.read<DataService>();
-    final legShareId = notification.body.trim();
+    final legShareId = _extractLegShareId(notification.body);
-    if (legShareId.isEmpty) {
+    if (legShareId == null) {
       return const Text('Invalid leg share notification.');
     }
     final future = data.fetchLegShare(legShareId);
@@ -144,4 +145,19 @@ class LegShareNotificationCard extends StatelessWidget {
     final path = '/add?share=${Uri.encodeComponent(share.id)}&ts=$ts';
     router.go(path, extra: target);
   }
+
+  String? _extractLegShareId(String rawBody) {
+    final trimmed = rawBody.trim();
+    if (trimmed.isEmpty) return null;
+    if (RegExp(r'^[0-9]+$').hasMatch(trimmed)) return trimmed;
+    try {
+      final decoded = jsonDecode(trimmed);
+      if (decoded is Map) {
+        final id = decoded['share_id'] ?? decoded['leg_share_id'];
+        final str = id?.toString() ?? '';
+        if (RegExp(r'^[0-9]+$').hasMatch(str)) return str;
+      }
+    } catch (_) {}
+    return null;
+  }
 }

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,17 +931,21 @@ 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);
-        final dateCompare = aDate.compareTo(bDate);
-        if (dateCompare != 0) return dateCompare;
-        return a.attrCode.compareTo(b.attrCode);
-      },
     );
     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);
+  }
+
   String get valueLabel {
     if (valueStr != null && valueStr!.isNotEmpty) return valueStr!;
     if (valueEnum != null && valueEnum!.isNotEmpty) return valueEnum!;

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

@@ -588,6 +588,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_leg_share.dart

@@ -88,6 +88,18 @@ extension DataServiceLegShare on DataService {
     return null;
   }
 
+  Future<void> applyLegPartialUpdates({
+    required int legId,
+    required Map<String, dynamic> updates,
+  }) async {
+    try {
+      await api.post('/leg/update/$legId/partial', updates);
+    } catch (e) {
+      debugPrint('Failed to apply partial updates for leg $legId: $e');
+      rethrow;
+    }
+  }
+
   int? _parseNullableInt(dynamic value) {
     if (value is int) return value;
     if (value is num) return value.toInt();

lib/services/data_service/data_service_traction.dart

@@ -66,14 +66,68 @@ extension DataServiceTraction on DataService {
     }
   }
 
-  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 +138,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 +322,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) {
@@ -179,4 +401,140 @@ extension DataServiceTraction on DataService {
     }
     return null;
   }
+
+  Future<List<LeaderboardEntry>> fetchClassLeaderboard(
+    String locoClass, {
+    bool friends = false,
+  }) async {
+    try {
+      final path = Uri.encodeComponent(locoClass);
+      final suffix = friends ? '/friends' : '';
+      final json = await api.get('/stats/class/$path/leaderboard$suffix');
+      List<dynamic>? list;
+      if (json is List) {
+        list = json;
+      } else if (json is Map) {
+        for (final key in ['leaderboard', 'data', 'items', 'results']) {
+          final value = json[key];
+          if (value is List) {
+            list = value;
+            break;
+          }
+        }
+      }
+      return list
+              ?.whereType<Map>()
+              .map((e) => LeaderboardEntry.fromJson(
+                    e.map((k, v) => MapEntry(k.toString(), v)),
+                  ))
+              .toList() ??
+          const [];
+    } catch (e) {
+      debugPrint(
+        'Failed to fetch class leaderboard for $locoClass (friends=$friends): $e',
+      );
+      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,13 +20,17 @@ 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/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 =
@@ -101,12 +105,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();
@@ -169,7 +167,54 @@ 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 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,
+                  transferFromLocoId: transferFromLocoId,
+                );
+              },
+            ),
+            GoRoute(
+              path: '/traction/pending',
+              builder: (context, state) => const TractionPendingPage(),
             ),
             GoRoute(
               path: '/profile',
@@ -290,20 +335,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,
         );
       },
     );
@@ -731,7 +790,8 @@ class _MyHomePageState extends State<MyHomePage> {
             final item = notifications[index];
             final isFriendRequest = _isFriendRequestNotification(item);
             final isLegShare = _isLegShareNotification(item);
-            final isSpecial = isFriendRequest || isLegShare;
+            final isLegShareEdit = _isLegShareEditNotification(item);
+            final isSpecial = isFriendRequest || isLegShare || isLegShareEdit;
             return Card(
               child: Padding(
                 padding: const EdgeInsets.all(12.0),
@@ -754,10 +814,12 @@ class _MyHomePageState extends State<MyHomePage> {
                               ),
                               const SizedBox(height: 4),
                               Text(
-                                isFriendRequest || isLegShare
+                                isSpecial
                                     ? isFriendRequest
                                         ? 'Accept to share entries'
-                                        : 'Shared entry details below.'
+                                        : isLegShareEdit
+                                            ? 'Shared leg edits below.'
+                                            : 'Shared entry details below.'
                                     : item.body,
                                 style: Theme.of(context).textTheme.bodyMedium,
                               ),
@@ -801,6 +863,13 @@ class _MyHomePageState extends State<MyHomePage> {
                           notification: item,
                         ),
                       ),
+                    if (_isLegShareEditNotification(item))
+                      Padding(
+                        padding: const EdgeInsets.only(top: 8.0),
+                        child: LegShareEditNotificationCard(
+                          notification: item,
+                        ),
+                      ),
                     if (isLegShare)
                       Padding(
                         padding: const EdgeInsets.only(top: 8.0),
@@ -890,7 +959,22 @@ class _MyHomePageState extends State<MyHomePage> {
   bool _isLegShareNotification(UserNotification notification) {
     final channel = notification.channel.trim().toLowerCase();
     final type = notification.type.trim().toLowerCase();
-    return channel.contains('leg_share') || type.contains('leg_share');
+    final isAcceptEdits =
+        _isLegShareAcceptEdits(channel) || _isLegShareAcceptEdits(type);
+    return (channel.contains('leg_share') || type.contains('leg_share')) &&
+        !isAcceptEdits;
+  }
+
+  bool _isLegShareEditNotification(UserNotification notification) {
+    final channel = notification.channel.trim().toLowerCase();
+    final type = notification.type.trim().toLowerCase();
+    return _isLegShareAcceptEdits(channel) || _isLegShareAcceptEdits(type);
+  }
+
+  bool _isLegShareAcceptEdits(String value) {
+    final normalized = value.trim().toLowerCase();
+    // Match both singular/plural: leg_share_accept_edit / leg_share_accept_edits
+    return normalized.contains('leg_share_accept_edit');
   }
 
   Widget _buildBadge(String label) {

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.4+7
+version: 0.7.1+9
 
 environment:
   sdk: ^3.8.1