make carousel more stable

.gitea/workflows/release.yml

@@ -18,7 +18,7 @@ env:
 jobs:
   meta:
     runs-on:
-      - mileograph
+      - tgj-arc
     outputs:
       base_version: ${{ steps.meta.outputs.base }}
       release_tag: ${{ steps.meta.outputs.release_tag }}
@@ -317,7 +317,7 @@ jobs:
 
   release-dev:
     runs-on:
-      - mileograph
+      - tgj-arc
     needs:
       - meta
       - android-build
@@ -423,7 +423,7 @@ jobs:
 
   release-master:
     runs-on:
-      - mileograph
+      - tgj-arc
     needs:
       - meta
       - android-build

assets/logos/pg_logo_v2.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="120"
+   height="120"
+   viewBox="0 0 120 120"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <path
+       style="fill:#00b7fd;stroke-width:4.40315"
+       d="M 42.563242,0 H 92.5 A 27.5,27.5 45 0 1 120,27.5 27.5,27.5 135 0 1 92.5,55 h -50 A 2.5,2.5 45 0 1 40,52.5 v -10 A 2.5,2.5 135 0 1 42.5,40 h 50 A 12.5,12.5 135 0 0 105,27.5 12.5,12.5 45 0 0 92.5,15 l -50,0 A 27.5,27.5 135 0 0 15,42.5 v 50 A 2.5,2.5 135 0 1 12.5,95 H 2.5 A 2.5,2.5 45 0 1 0,92.5 V 42.563242 A 42.563242,42.563242 135 0 1 42.563242,0 Z"
+       id="path1"
+       transform="translate(0,12.5)" />
+    <path
+       style="fill:#999999;stroke-width:4.40315"
+       d="m 42.5,60 h 60 A 17.5,17.5 45 0 1 120,77.5 17.5,17.5 135 0 1 102.5,95 h -60 A 22.5,22.5 45 0 1 20,72.5 v -30 A 22.5,22.5 135 0 1 42.5,20 h 50 a 7.5,7.5 45 0 1 7.5,7.5 7.5,7.5 135 0 1 -7.5,7.5 h -50 A 7.5,7.5 135 0 0 35,42.5 v 30 a 7.5,7.5 45 0 0 7.5,7.5 h 60 A 2.5,2.5 135 0 0 105,77.5 2.5,2.5 45 0 0 102.5,75 h -60 A 2.5,2.5 45 0 1 40,72.5 v -10 A 2.5,2.5 135 0 1 42.5,60 Z"
+       id="path2"
+       transform="translate(0,12.5)" />
+  </g>
+</svg>

lib/app.dart

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

lib/components/calculator/calculator.dart

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

lib/components/dashboard/leaderboard_panel.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
+import 'package:mileograph_flutter/components/widgets/animated_count_text.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';
@@ -136,11 +137,10 @@ class _LeaderboardPanelState extends State<LeaderboardPanel> {
                         crossAxisAlignment: WrapCrossAlignment.center,
                         spacing: 8,
                         children: [
-                          Text(
-                            distanceUnits.format(
-                              leaderboard[index].mileage,
-                              decimals: 1,
-                            ),
+                          AnimatedCountText(
+                            value: leaderboard[index].mileage,
+                            formatter: (val) =>
+                                distanceUnits.format(val, decimals: 1),
                             style: textTheme.labelLarge?.copyWith(
                               fontWeight: FontWeight.w700,
                             ),

lib/components/dashboard/top_traction_panel.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:mileograph_flutter/components/widgets/animated_count_text.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';
@@ -78,11 +79,10 @@ class TopTractionPanel extends StatelessWidget {
                                 fontStyle: FontStyle.italic,
                               ),
                       ),
-                      trailing: Text(
-                        distanceUnits.format(
-                          locos[index].mileage ?? 0,
-                          decimals: 1,
-                        ),
+                      trailing: AnimatedCountText(
+                        value: (locos[index].mileage ?? 0).toDouble(),
+                        formatter: (val) =>
+                            distanceUnits.format(val, decimals: 1),
                         style: textTheme.labelLarge?.copyWith(
                           fontWeight: FontWeight.w700,
                         ),

lib/components/login/login.dart

@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/components/pages/settings.dart';
@@ -41,17 +43,29 @@ class _LoginScreenState extends State<LoginScreen> {
       resizeToAvoidBottomInset: true,
       body: Container(
         color: Theme.of(context).scaffoldBackgroundColor,
+        child: SafeArea(
+          child: Column(
+            children: [
+              Expanded(
                 child: Center(
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
-              Text.rich(
+                      LayoutBuilder(
+                        builder: (context, constraints) {
+                          return SizedBox(
+                            width: constraints.maxWidth,
+                            child: FittedBox(
+                              fit: BoxFit.scaleDown,
+                              child: Text.rich(
                                 TextSpan(
                                   children: [
                                     TextSpan(
                                       text: "Mile",
                                       style: TextStyle(
-                        color: Theme.of(context).textTheme.bodyLarge?.color,
+                                        color: Theme.of(
+                                          context,
+                                        ).textTheme.bodyLarge?.color,
                                       ),
                                     ),
                                     const TextSpan(
@@ -61,7 +75,9 @@ class _LoginScreenState extends State<LoginScreen> {
                                     TextSpan(
                                       text: "graph",
                                       style: TextStyle(
-                        color: Theme.of(context).textTheme.bodyLarge?.color,
+                                        color: Theme.of(
+                                          context,
+                                        ).textTheme.bodyLarge?.color,
                                       ),
                                     ),
                                   ],
@@ -72,6 +88,12 @@ class _LoginScreenState extends State<LoginScreen> {
                                     fontSize: 50,
                                   ),
                                 ),
+                                softWrap: false,
+                                overflow: TextOverflow.visible,
+                              ),
+                            ),
+                          );
+                        },
                       ),
                       const SizedBox(height: 50),
                       const LoginPanel(),
@@ -110,10 +132,69 @@ class _LoginScreenState extends State<LoginScreen> {
                   ),
                 ),
               ),
+              const Padding(
+                padding: EdgeInsets.only(bottom: 12),
+                child: _LoginLogo(),
+              ),
+            ],
+          ),
+        ),
+      ),
     );
   }
 }
 
+class _LoginLogo extends StatefulWidget {
+  const _LoginLogo();
+
+  @override
+  State<_LoginLogo> createState() => _LoginLogoState();
+}
+
+class _LoginLogoState extends State<_LoginLogo> {
+  late final Future<String> _svgFuture;
+
+  @override
+  void initState() {
+    super.initState();
+    _svgFuture = rootBundle.loadString('assets/logos/pg_logo_v2.svg');
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final accent = Theme.of(context).colorScheme.primary;
+    final grey = const Color(0xFF999999);
+    return SizedBox(
+      height: 42,
+      child: Opacity(
+        opacity: 0.75,
+        child: FutureBuilder<String>(
+          future: _svgFuture,
+          builder: (context, snapshot) {
+            final svg = snapshot.data;
+            if (svg == null) {
+              return const SizedBox.shrink();
+            }
+            final tinted = svg
+                .replaceAll('#00b7fd', _colorToHex(accent))
+                .replaceAll('#999999', _colorToHex(grey));
+            return SvgPicture.string(
+              tinted,
+              fit: BoxFit.contain,
+              semanticsLabel: 'Mileograph logo',
+            );
+          },
+        ),
+      ),
+    );
+  }
+
+  String _colorToHex(Color color) {
+    final hex = color.value.toRadixString(16).padLeft(8, '0');
+    return '#${hex.substring(2)}';
+  }
+}
+
 class LoginPanel extends StatefulWidget {
   const LoginPanel({super.key});
 

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');
             }
           },
         ),
@@ -449,6 +449,23 @@ class _BadgesPageState extends State<BadgesPage> {
     ClassClearanceProgress progress,
   ) {
     final pct = progress.percentComplete.clamp(0, 100);
+    final activePct = progress.activePercent.clamp(0, 100);
+    final showActive =
+        progress.activeTotal > 0 || progress.activeCompleted > 0;
+    final showActiveCrest =
+        progress.activeTotal > 0 && progress.activeCompleted == progress.activeTotal;
+    final scheme = Theme.of(context).colorScheme;
+    final total = progress.total;
+    final activeTotal = progress.activeTotal.clamp(0, total);
+    final had = progress.completed.clamp(0, total);
+    final activeHad = progress.activeCompleted.clamp(0, activeTotal).clamp(0, had);
+    final activeRemaining =
+        (activeTotal - activeHad).clamp(0, total - had);
+    final remaining =
+        (total - activeTotal - (had - activeHad)).clamp(0, total);
+    final hadColor = scheme.primary;
+    final activeColor = scheme.primary.withValues(alpha: 0.4);
+    final remainingColor = scheme.primary.withValues(alpha: 0.18);
     return Card(
       margin: const EdgeInsets.symmetric(vertical: 4.0),
       child: Padding(
@@ -471,9 +488,55 @@ class _BadgesPageState extends State<BadgesPage> {
               ],
             ),
             const SizedBox(height: 4),
-            LinearProgressIndicator(
-              value: progress.total == 0 ? 0 : pct / 100,
-              minHeight: 6,
+            if (showActive)
+              Padding(
+                padding: const EdgeInsets.only(bottom: 6.0),
+                child: Row(
+                  children: [
+                    Text(
+                      'Active: ${progress.activeCompleted}/${progress.activeTotal} (${activePct.toStringAsFixed(0)}%)',
+                      style: Theme.of(context)
+                          .textTheme
+                          .labelSmall
+                          ?.copyWith(color: Theme.of(context).hintColor),
+                    ),
+                    if (showActiveCrest) ...[
+                      const SizedBox(width: 6),
+                      Icon(
+                        Icons.verified,
+                        size: 14,
+                        color: scheme.primary,
+                      ),
+                    ],
+                  ],
+                ),
+              ),
+            ClipRRect(
+              borderRadius: BorderRadius.circular(6),
+              child: SizedBox(
+                height: 6,
+                child: total <= 0
+                    ? Container(color: remainingColor)
+                    : Row(
+                        children: [
+                          if (had > 0)
+                            Expanded(
+                              flex: had,
+                              child: Container(color: hadColor),
+                            ),
+                          if (showActive && activeRemaining > 0)
+                            Expanded(
+                              flex: activeRemaining,
+                              child: Container(color: activeColor),
+                            ),
+                          if (remaining > 0)
+                            Expanded(
+                              flex: remaining,
+                              child: Container(color: remainingColor),
+                            ),
+                        ],
+                      ),
+              ),
             ),
             if (progress.total > 0)
               Padding(

lib/components/pages/dashboard.dart

@@ -1,9 +1,13 @@
+import 'dart:async';
+import 'dart:math';
+
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:intl/intl.dart';
 import 'package:mileograph_flutter/components/dashboard/latest_loco_changes_panel.dart';
 import 'package:mileograph_flutter/components/dashboard/leaderboard_panel.dart';
 import 'package:mileograph_flutter/components/dashboard/top_traction_panel.dart';
+import 'package:mileograph_flutter/components/widgets/animated_count_text.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
@@ -19,6 +23,18 @@ class Dashboard extends StatefulWidget {
 
 class _DashboardState extends State<Dashboard> {
   bool _showAllOnThisDay = false;
+  bool _isCurrent = false;
+  Timer? _carouselTimer;
+  int _carouselIndex = 0;
+  int _carouselItemCount = 0;
+  final Random _carouselRandom = Random();
+  List<ClassClearanceProgress> _carouselItems = const [];
+  String _carouselSignature = '';
+
+  @override
+  void initState() {
+    super.initState();
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -31,16 +47,11 @@ class _DashboardState extends State<Dashboard> {
 
     return RefreshIndicator(
       onRefresh: () async {
-        await data.fetchHomepageStats();
-        await Future.wait([
-          data.fetchOnThisDay(),
-          data.fetchTripDetails(),
-          data.fetchHadTraction(),
-          data.fetchLatestLocoChanges(),
-        ]);
+        await _refreshDashboardData(force: true);
       },
       child: LayoutBuilder(
         builder: (context, constraints) {
+          _handleRouteFocus();
           const spacing = 16.0;
           final maxWidth = constraints.maxWidth;
           return Stack(
@@ -97,9 +108,6 @@ class _DashboardState extends State<Dashboard> {
     final totalMileage = stats?.totalMileage ?? 0;
     final currentYearMileage = data.getMileageForCurrentYear();
     final legCount = stats?.legCount ?? data.trips.length;
-    final progress = totalMileage == 0
-        ? 0.0
-        : (currentYearMileage / totalMileage).clamp(0, 1).toDouble();
 
     return Card(
       clipBehavior: Clip.antiAlias,
@@ -125,62 +133,248 @@ class _DashboardState extends State<Dashboard> {
               spacing: 12,
               runSpacing: 12,
               children: [
-                _metricTile(
+                _animatedMetricTile(
                   context,
                   label: 'Total mileage',
-                  value: distanceUnits.format(totalMileage, decimals: 1),
+                  value: totalMileage.toDouble(),
+                  formatter: (val) =>
+                      distanceUnits.format(val, decimals: 1),
                   icon: Icons.route,
                   color: colorScheme.onPrimaryContainer,
                 ),
-                _metricTile(
+                _animatedMetricTile(
                   context,
                   label: 'This year',
-                  value: distanceUnits.format(currentYearMileage, decimals: 1),
+                  value: currentYearMileage.toDouble(),
+                  formatter: (val) =>
+                      distanceUnits.format(val, decimals: 1),
                   icon: Icons.calendar_today,
                   color: colorScheme.onPrimaryContainer,
                 ),
-                _metricTile(
+                _animatedMetricTile(
                   context,
                   label: 'Entries logged',
-                  value: legCount.toString(),
+                  value: legCount.toDouble(),
+                  formatter: (val) => val.round().toString(),
                   icon: Icons.format_list_bulleted,
                   color: colorScheme.onPrimaryContainer,
                 ),
               ],
             ),
             const SizedBox(height: 16),
-            ClipRRect(
-              borderRadius: BorderRadius.circular(12),
-              child: LinearProgressIndicator(
-                value: progress.isNaN ? 0 : progress,
-                minHeight: 10,
-                backgroundColor: colorScheme.onPrimaryContainer.withValues(
-                  alpha: 0.2,
-                ),
-                valueColor: AlwaysStoppedAnimation<Color>(
-                  colorScheme.onPrimaryContainer,
-                ),
-              ),
-            ),
-            const SizedBox(height: 6),
-            Text(
-              totalMileage == 0
-                  ? 'Log a new entry to start your timeline.'
-                  : 'Year-to-date is ${(progress * 100).toStringAsFixed(0)}% of all mileage.',
-              style: Theme.of(context).textTheme.labelSmall?.copyWith(
-                color: colorScheme.onPrimaryContainer.withValues(alpha: 0.8),
-              ),
-            ),
+            _buildClassClearanceCarousel(context, data, colorScheme),
           ],
         ),
       ),
     );
   }
 
-  Widget _metricTile(
+  Widget _buildClassClearanceCarousel(
+    BuildContext context,
+    DataService data,
+    ColorScheme colorScheme,
+  ) {
+    final items = data.classClearanceProgress;
+    final loading = data.isClassClearanceProgressLoading;
+    _refreshCarouselItems(items);
+    _startCarouselIfNeeded(_carouselItems.length);
+
+    if (loading && _carouselItems.isEmpty) {
+      return const Padding(
+        padding: EdgeInsets.symmetric(vertical: 8.0),
+        child: Center(
+          child: SizedBox(
+            height: 16,
+            width: 16,
+            child: CircularProgressIndicator(strokeWidth: 2),
+          ),
+        ),
+      );
+    }
+
+    if (_carouselItems.isEmpty) {
+      return Text(
+        'No class clearance progress yet.',
+        style: Theme.of(context).textTheme.labelSmall?.copyWith(
+              color: colorScheme.onPrimaryContainer.withValues(alpha: 0.8),
+            ),
+      );
+    }
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          'Class clearance (in progress)',
+          style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                color: colorScheme.onPrimaryContainer.withValues(alpha: 0.8),
+              ),
+        ),
+        const SizedBox(height: 6),
+        SizedBox(
+          height: 58,
+          child: AnimatedSwitcher(
+            duration: const Duration(milliseconds: 450),
+            switchInCurve: Curves.easeOutCubic,
+            switchOutCurve: Curves.easeInCubic,
+            transitionBuilder: (child, animation) {
+              final tween = Tween<Offset>(
+                begin: const Offset(0, 0.4),
+                end: Offset.zero,
+              );
+              return ClipRect(
+                child: SlideTransition(
+                  position: animation.drive(tween),
+                  child: FadeTransition(opacity: animation, child: child),
+                ),
+              );
+            },
+            child: _buildClassClearanceSlide(
+              context,
+              _carouselItems[_carouselIndex % _carouselItems.length],
+              colorScheme,
+              key: ValueKey(_carouselIndex),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildClassClearanceSlide(
+    BuildContext context,
+    ClassClearanceProgress progress,
+    ColorScheme colorScheme,
+    {Key? key}
+  ) {
+    final pct = progress.percentComplete.clamp(0, 100);
+    final textTheme = Theme.of(context).textTheme;
+    final ratio = progress.total == 0
+        ? 0.0
+        : (progress.completed / progress.total).clamp(0.0, 1.0);
+    final activeRatio = progress.total == 0
+        ? 0.0
+        : (progress.activeTotal / progress.total).clamp(0.0, 1.0);
+    return TweenAnimationBuilder<double>(
+      key: key ?? ValueKey(progress.className),
+      tween: Tween(begin: 0, end: ratio),
+      duration: const Duration(milliseconds: 1200),
+      curve: Curves.easeOutCubic,
+      builder: (context, value, child) {
+        final ratioValue = ratio == 0 ? 0.0 : (value / ratio).clamp(0.0, 1.0);
+        final animatedHad = (progress.completed * ratioValue).round();
+        final animatedActive = (progress.activeTotal * ratioValue).round();
+        final animatedActiveRatio =
+            (activeRatio * ratioValue).clamp(0.0, activeRatio);
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Expanded(
+                  child: Text(
+                    progress.className,
+                    style: textTheme.labelLarge?.copyWith(
+                      color: colorScheme.onPrimaryContainer,
+                      fontWeight: FontWeight.w700,
+                    ),
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                ),
+                const SizedBox(width: 8),
+                Text(
+                  '${pct.toStringAsFixed(0)}% • $animatedHad/$animatedActive/${progress.total}',
+                  style: textTheme.labelSmall?.copyWith(
+                    color: colorScheme.onPrimaryContainer
+                        .withValues(alpha: 0.8),
+                  ),
+                ),
+              ],
+            ),
+            const SizedBox(height: 6),
+            ClipRRect(
+              borderRadius: BorderRadius.circular(10),
+              child: SizedBox(
+                height: 8,
+                child: Stack(
+                  children: [
+                    Container(
+                      color: colorScheme.onPrimaryContainer.withValues(
+                        alpha: 0.2,
+                      ),
+                    ),
+                    FractionallySizedBox(
+                      alignment: Alignment.centerLeft,
+                      widthFactor: animatedActiveRatio.isNaN
+                          ? 0
+                          : animatedActiveRatio,
+                      child: Container(
+                        color:
+                            colorScheme.onPrimaryContainer.withValues(alpha: 0.5),
+                      ),
+                    ),
+                    FractionallySizedBox(
+                      alignment: Alignment.centerLeft,
+                      widthFactor: value.isNaN ? 0 : value,
+                      child: Container(
+                        color: colorScheme.onPrimaryContainer,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  void _startCarouselIfNeeded(int count) {
+    if (count <= 1) {
+      _stopCarousel();
+      return;
+    }
+    if (_carouselItemCount != count) {
+      _carouselItemCount = count;
+      _carouselIndex = 0;
+    }
+    if (_carouselTimer != null) return;
+    _carouselTimer = Timer.periodic(const Duration(seconds: 8), (_) {
+      if (!mounted || _carouselItemCount == 0) return;
+      setState(() {
+        _carouselIndex = (_carouselIndex + 1) % _carouselItemCount;
+      });
+    });
+  }
+
+  void _stopCarousel() {
+    _carouselTimer?.cancel();
+    _carouselTimer = null;
+  }
+
+  void _refreshCarouselItems(List<ClassClearanceProgress> items) {
+    final signature = items
+        .map((item) =>
+            '${item.className}:${item.completed}:${item.activeTotal}:${item.total}')
+        .join('|');
+    if (signature == _carouselSignature) return;
+    _carouselSignature = signature;
+    _carouselItems = List<ClassClearanceProgress>.from(items)
+      ..shuffle(_carouselRandom);
+  }
+
+  @override
+  void dispose() {
+    _stopCarousel();
+    super.dispose();
+  }
+
+  Widget _animatedMetricTile(
     BuildContext context, {
     required String label,
-    required String value,
+    required double value,
+    required String Function(double) formatter,
     required IconData icon,
     required Color color,
   }) {
@@ -207,8 +401,9 @@ class _DashboardState extends State<Dashboard> {
                   letterSpacing: 0.4,
                 ),
               ),
-              Text(
-                value,
+              AnimatedCountText(
+                value: value,
+                formatter: formatter,
                 style: Theme.of(context).textTheme.titleMedium?.copyWith(
                   fontWeight: FontWeight.w800,
                   color: color,
@@ -555,8 +750,10 @@ class _DashboardState extends State<Dashboard> {
                               style: Theme.of(context).textTheme.titleSmall
                                   ?.copyWith(fontWeight: FontWeight.w700),
                             ),
-                            Text(
-                              distanceUnits.format(trip.tripMileage, decimals: 1),
+                            AnimatedCountText(
+                              value: trip.tripMileage,
+                              formatter: (val) =>
+                                  distanceUnits.format(val, decimals: 1),
                               style: Theme.of(context).textTheme.labelMedium,
                             ),
                           ],
@@ -573,4 +770,31 @@ class _DashboardState extends State<Dashboard> {
   String _formatTime(DateTime date) {
     return DateFormat('HH:mm').format(date);
   }
+
+  Future<void> _refreshDashboardData({bool force = false}) async {
+    final data = context.read<DataService>();
+    await data.fetchHomepageStats();
+    await Future.wait([
+      data.fetchOnThisDay(),
+      data.fetchTripDetails(),
+      data.fetchHadTraction(),
+      data.fetchLatestLocoChanges(),
+      data.fetchClassClearanceProgress(limit: 75, onlyIncomplete: true),
+    ]);
+  }
+
+  void _handleRouteFocus() {
+    final isCurrent = ModalRoute.of(context)?.isCurrent ?? true;
+    if (isCurrent && !_isCurrent) {
+      _isCurrent = true;
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (!mounted) return;
+        _refreshDashboardData();
+      });
+      return;
+    }
+    if (!isCurrent && _isCurrent) {
+      _isCurrent = false;
+    }
+  }
 }

lib/components/pages/loco_timeline.dart

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

lib/components/pages/loco_timeline/event_editor.dart

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

lib/components/pages/loco_timeline/timeline_grid.dart

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

lib/components/pages/more/admin_page.dart

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

lib/components/pages/new_entry/new_entry_page.dart

@@ -130,11 +130,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
     int decimals = 1,
     bool includeUnit = true,
   }) {
-    return units.format(
-      miles,
-      decimals: decimals,
-      includeUnit: includeUnit,
-    );
+    return units.format(miles, decimals: decimals, includeUnit: includeUnit);
   }
 
   String _manualMileageLabel(DistanceUnit unit) {
@@ -191,15 +187,13 @@ class _NewEntryPageState extends State<NewEntryPage> {
   }
 
   double _milesFromInputWithUnit(DistanceUnit unit) {
-    return DistanceFormatter(unit)
-            .parseInputMiles(_mileageController.text.trim()) ??
+    return DistanceFormatter(
+          unit,
+        ).parseInputMiles(_mileageController.text.trim()) ??
         0;
   }
 
-  List<UserSummary> _friendsFromFriendships(
-    DataService data,
-    String? selfId,
-  ) {
+  List<UserSummary> _friendsFromFriendships(DataService data, String? selfId) {
     final friends = <UserSummary>[];
     for (final f in data.friendships) {
       final other = _friendFromFriendship(f, selfId);
@@ -300,9 +294,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
     if (!mounted) return;
     final baseFriends = _friendsFromFriendships(data, auth.userId);
     final initialSelectedIds = {..._shareUserIds};
-    final initialSelectedUsers = {
-      for (final u in _shareUsers) u.userId: u,
-    };
+    final initialSelectedUsers = {for (final u in _shareUsers) u.userId: u};
 
     final result = await showModalBottomSheet<List<UserSummary>>(
       context: context,
@@ -334,8 +326,10 @@ class _NewEntryPageState extends State<NewEntryPage> {
                 searchError = null;
               });
               try {
-                final results =
-                    await data.searchUsers(trimmed, friendsOnly: true);
+                final results = await data.searchUsers(
+                  trimmed,
+                  friendsOnly: true,
+                );
                 setModalState(() {
                   searchResults = results;
                 });
@@ -414,8 +408,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
                             itemCount: list.length,
                             itemBuilder: (_, index) {
                               final user = list[index];
-                              final isSelected =
-                                  selectedIds.contains(user.userId);
+                              final isSelected = selectedIds.contains(
+                                user.userId,
+                              );
                               return CheckboxListTile(
                                 value: isSelected,
                                 title: Text(user.displayName),
@@ -481,8 +476,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
     if (previousUnit == currentUnit) return;
 
     final miles = _milesFromInputWithUnit(previousUnit);
-    final nextText = DistanceFormatter(currentUnit)
-        .format(miles, decimals: 2, includeUnit: false);
+    final nextText = DistanceFormatter(
+      currentUnit,
+    ).format(miles, decimals: 2, includeUnit: false);
     _mileageController.text = nextText;
     _lastDistanceUnit = currentUnit;
   }
@@ -842,8 +838,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
       final destination = json['leg_destination'] as String? ?? '';
       final hasEndTime = endTime != null || endDelay != 0;
       final originTime = DateTime.tryParse(json['leg_origin_time'] ?? '');
-      final destinationTime =
-          DateTime.tryParse(json['leg_destination_time'] ?? '');
+      final destinationTime = DateTime.tryParse(
+        json['leg_destination_time'] ?? '',
+      );
       final hasOriginTime = originTime != null;
       final hasDestinationTime = destinationTime != null;
 
@@ -860,8 +857,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
         _selectedOriginDate = originTime ?? beginTime;
         _selectedOriginTime = TimeOfDay.fromDateTime(originTime ?? beginTime);
         _selectedDestinationDate = destinationTime ?? endTime ?? beginTime;
-        _selectedDestinationTime =
-            TimeOfDay.fromDateTime(destinationTime ?? endTime ?? beginTime);
+        _selectedDestinationTime = TimeOfDay.fromDateTime(
+          destinationTime ?? endTime ?? beginTime,
+        );
         _hasOriginTime = hasOriginTime;
         _hasDestinationTime = hasDestinationTime;
         _useManualMileage = useManual;
@@ -927,7 +925,8 @@ class _NewEntryPageState extends State<NewEntryPage> {
           );
     final tractionItems = _buildTractionFromApi(
       entry.locos
-          .map((l) => {
+          .map(
+            (l) => {
               "loco_id": l.id,
               "type": l.type,
               "number": l.number,
@@ -938,7 +937,8 @@ class _NewEntryPageState extends State<NewEntryPage> {
               "evn": l.evn,
               "alloc_pos": l.allocPos,
               "alloc_powering": l.powering ? 1 : 0,
-              })
+            },
+          )
           .toList(),
     );
     final beginDelay = entry.beginDelayMinutes ?? 0;
@@ -963,8 +963,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
       _selectedOriginDate = originTime ?? beginTime;
       _selectedOriginTime = TimeOfDay.fromDateTime(originTime ?? beginTime);
       _selectedDestinationDate = destinationTime ?? endTime ?? beginTime;
-      _selectedDestinationTime =
-          TimeOfDay.fromDateTime(destinationTime ?? endTime ?? beginTime);
+      _selectedDestinationTime = TimeOfDay.fromDateTime(
+        destinationTime ?? endTime ?? beginTime,
+      );
       _hasOriginTime = hasOriginTime;
       _hasDestinationTime = hasDestinationTime;
       _useManualMileage = useManual;
@@ -980,12 +981,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
       _endDelayController.text = endDelay.toString();
       _mileageController.text = mileageVal == 0
           ? ''
-          : _formatDistance(
-              units,
-              mileageVal,
-              decimals: 2,
-              includeUnit: false,
-            );
+          : _formatDistance(units, mileageVal, decimals: 2, includeUnit: false);
       _tractionItems
         ..clear()
         ..addAll(tractionItems);
@@ -1187,10 +1183,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
           ),
         ],
         if (!matchValue) ...[
-          _stationField(
-            label: label,
-            controller: controller,
-          ),
+          _stationField(label: label, controller: controller),
           CheckboxListTile(
             value: hasTime,
             onChanged: onTimeChanged,
@@ -1237,8 +1230,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
                       minimumSize: const Size(0, 36),
                       tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                     ),
-                    onPressed:
-                        _isEditing || _activeLegShare != null ? null : _openDrafts,
+                    onPressed: _isEditing || _activeLegShare != null
+                        ? null
+                        : _openDrafts,
                     icon: const Icon(Icons.list_alt, size: 16),
                     label: const Text('Drafts'),
                   ),
@@ -1249,7 +1243,8 @@ class _NewEntryPageState extends State<NewEntryPage> {
                       minimumSize: const Size(0, 36),
                       tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                     ),
-                  onPressed: _isEditing ||
+                    onPressed:
+                        _isEditing ||
                             _savingDraft ||
                             _submitting ||
                             _activeLegShare != null
@@ -1393,8 +1388,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
                 onTimeChanged: _submitting ? null : _toggleDestinationTime,
                 matchLabel: 'Match entry end',
                 matchValue: _matchDestinationToEntry,
-                onMatchChanged:
-                    _submitting ? null : _toggleMatchDestination,
+                onMatchChanged: _submitting ? null : _toggleMatchDestination,
                 pickerBuilder: () => _dateTimeGroupSimple(
                   context,
                   title: 'Destination arrival',
@@ -1428,7 +1422,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
             final tractionPanel = _section('Traction', [
               Align(
                 alignment: Alignment.centerLeft,
-                child: ElevatedButton.icon(
+                child: FilledButton.icon(
                   onPressed: _openTractionPicker,
                   icon: const Icon(Icons.search),
                   label: const Text('Search traction'),
@@ -1456,12 +1450,12 @@ class _NewEntryPageState extends State<NewEntryPage> {
                     spacing: 12,
                     runSpacing: 8,
                     children: [
-                      ElevatedButton.icon(
+                      FilledButton.icon(
                         onPressed: _openCalculator,
                         icon: const Icon(Icons.calculate, size: 18),
                         label: const Text('Open mileage calculator'),
                       ),
-                      OutlinedButton.icon(
+                      TextButton.icon(
                         onPressed: _reverseRouteAndEndpoints,
                         icon: const Icon(Icons.swap_horiz),
                         label: const Text('Reverse route'),
@@ -1493,8 +1487,8 @@ class _NewEntryPageState extends State<NewEntryPage> {
                     ),
                     decoration: InputDecoration(
                       labelText: mileageLabel,
-                      helperText: currentDistanceUnit ==
-                              DistanceUnit.milesChains
+                      helperText:
+                          currentDistanceUnit == DistanceUnit.milesChains
                           ? 'Enter as miles.chains (e.g., 12.40 for 12m 40c)'
                           : null,
                       border: const OutlineInputBorder(),
@@ -1571,7 +1565,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
                       ],
                     ),
                   const SizedBox(height: 12),
-                  ElevatedButton.icon(
+                  FilledButton.icon(
                     onPressed: _submitting ? null : _submit,
                     icon: _submitting
                         ? const SizedBox(
@@ -1842,7 +1836,11 @@ class _NewEntryPageState extends State<NewEntryPage> {
     return best;
   }
 
-  void _insertCandidate(List<String> best, String candidate, {required int max}) {
+  void _insertCandidate(
+    List<String> best,
+    String candidate, {
+    required int max,
+  }) {
     final existingIndex = best.indexOf(candidate);
     if (existingIndex >= 0) return;
 
@@ -2016,7 +2014,6 @@ class _NewEntryPageState extends State<NewEntryPage> {
       ],
     );
   }
-
 }
 
 class _UpperCaseTextFormatter extends TextInputFormatter {

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

@@ -1,3 +1,5 @@
+import 'dart:typed_data';
+
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';
@@ -5,6 +7,7 @@ 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/utils/download_helper.dart';
 
 class ProfilePage extends StatefulWidget {
   const ProfilePage({super.key});
@@ -31,6 +34,10 @@ class _ProfilePageState extends State<ProfilePage> {
   bool _showAccountSettings = false;
   bool _changingPassword = false;
   static const List<String> _visibilityOptions = ['private', 'friends', 'public'];
+  static const List<String> _exportFormats = ['xlsx', 'json', 'csv'];
+  bool _exporting = false;
+  String _exportFormat = 'xlsx';
+  String? _exportError;
 
   UserSummary? _selectedUser;
   Friendship? _status;
@@ -71,6 +78,54 @@ class _ProfilePageState extends State<ProfilePage> {
     super.dispose();
   }
 
+  Future<void> _exportLogEntries() async {
+    if (_exporting) return;
+    setState(() {
+      _exporting = true;
+      _exportError = null;
+    });
+    try {
+      final data = context.read<DataService>();
+      final response = await data.api.getBytes(
+        '/legs/export?export_format=$_exportFormat',
+        headers: const {'accept': '*/*'},
+      );
+      final timestamp = DateTime.now()
+          .toIso8601String()
+          .replaceAll(':', '')
+          .replaceAll('.', '');
+      final fallbackName = 'log_entries_$timestamp.$_exportFormat';
+      final filename = response.filename ?? fallbackName;
+      final saveResult = await saveBytes(
+        Uint8List.fromList(response.bytes),
+        filename,
+        mimeType: response.contentType,
+      );
+      if (!mounted) return;
+      if (saveResult.canceled) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Export canceled.')),
+        );
+      } else {
+        final path = saveResult.path;
+        final message = path == null || path.isEmpty
+            ? 'Download started.'
+            : 'Export saved to $path';
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(message)),
+        );
+      }
+    } on ApiException catch (e) {
+      if (!mounted) return;
+      setState(() => _exportError = e.message);
+    } catch (e) {
+      if (!mounted) return;
+      setState(() => _exportError = e.toString());
+    } finally {
+      if (mounted) setState(() => _exporting = false);
+    }
+  }
+
   Future<void> _searchUsers() async {
     final query = _searchController.text.trim();
     if (query.isEmpty) {
@@ -127,6 +182,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 +217,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 +234,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 +423,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(
@@ -812,6 +884,8 @@ class _ProfilePageState extends State<ProfilePage> {
               firstChild: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
+                  _buildExportSection(theme),
+                  const SizedBox(height: 12),
                   if (showPrivacySpinner)
                     const Padding(
                       padding: EdgeInsets.symmetric(vertical: 8.0),
@@ -1006,6 +1080,60 @@ class _ProfilePageState extends State<ProfilePage> {
     );
   }
 
+  Widget _buildExportSection(ThemeData theme) {
+    return ExpansionTile(
+      tilePadding: EdgeInsets.zero,
+      childrenPadding: const EdgeInsets.only(top: 8),
+      title: Text(
+        'Export log entries',
+        style: theme.textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w700),
+      ),
+      subtitle: const Text('Download your log as a file.'),
+      children: [
+        DropdownButtonFormField<String>(
+          value: _exportFormat,
+          decoration: const InputDecoration(
+            labelText: 'Export format',
+            border: OutlineInputBorder(),
+          ),
+          items: _exportFormats
+              .map(
+                (format) => DropdownMenuItem(
+                  value: format,
+                  child: Text(format.toUpperCase()),
+                ),
+              )
+              .toList(),
+          onChanged: _exporting
+              ? null
+              : (value) {
+                  if (value == null) return;
+                  setState(() => _exportFormat = value);
+                },
+        ),
+        const SizedBox(height: 12),
+        FilledButton.icon(
+          onPressed: _exporting ? null : _exportLogEntries,
+          icon: _exporting
+              ? const SizedBox(
+                  width: 18,
+                  height: 18,
+                  child: CircularProgressIndicator(strokeWidth: 2),
+                )
+              : const Icon(Icons.download),
+          label: Text(_exporting ? 'Exporting...' : 'Export'),
+        ),
+        if (_exportError != null) ...[
+          const SizedBox(height: 8),
+          Text(
+            _exportError!,
+            style: TextStyle(color: theme.colorScheme.error),
+          ),
+        ],
+      ],
+    );
+  }
+
   UserSummary? _otherUser(Friendship friendship, String? currentUserId) {
     final selfId = currentUserId ?? '';
     if (friendship.requester?.userId == selfId) return friendship.addressee;

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),
@@ -126,6 +141,7 @@ class _StatsPageState extends State<StatsPage> {
               ],
             ),
             const SizedBox(height: 8),
+            _buildTypeCountsSection(context, year),
             _buildSection<StatsClassMileage>(
               context,
               title: 'Top classes',
@@ -186,6 +202,83 @@ class _StatsPageState extends State<StatsPage> {
     );
   }
 
+  List<MapEntry<String, int>> _sortedTypeCounts(Map<String, int> counts) {
+    final entries = counts.entries.toList();
+    entries.sort((a, b) {
+      final countCompare = b.value.compareTo(a.value);
+      if (countCompare != 0) return countCompare;
+      return a.key.compareTo(b.key);
+    });
+    return entries;
+  }
+
+  Widget _buildTypeCountsSection(BuildContext context, StatsYear year) {
+    if (year.winnerTypeCounts.isEmpty && year.totalTypeCounts.isEmpty) {
+      return const SizedBox.shrink();
+    }
+    final theme = Theme.of(context);
+    return Padding(
+      padding: const EdgeInsets.only(top: 8),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            'Type counts',
+            style: theme.textTheme.titleMedium,
+          ),
+          const SizedBox(height: 6),
+          _buildTypeCountsRow(
+            context,
+            label: 'Winners',
+            counts: year.winnerTypeCounts,
+          ),
+          const SizedBox(height: 8),
+          _buildTypeCountsRow(
+            context,
+            label: 'Total',
+            counts: year.totalTypeCounts,
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildTypeCountsRow(
+    BuildContext context, {
+    required String label,
+    required Map<String, int> counts,
+  }) {
+    final theme = Theme.of(context);
+    final entries = _sortedTypeCounts(counts);
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          label,
+          style: theme.textTheme.labelLarge,
+        ),
+        const SizedBox(height: 4),
+        if (entries.isEmpty)
+          Text(
+            'No data',
+            style: theme.textTheme.bodySmall,
+          )
+        else
+          Wrap(
+            spacing: 6,
+            runSpacing: 6,
+            children: entries
+                .map((entry) => _buildInfoChip(
+                      context,
+                      label: entry.key,
+                      value: _countFormat.format(entry.value),
+                    ))
+                .toList(),
+          ),
+      ],
+    );
+  }
+
   Widget _buildSection<T>(
     BuildContext context, {
     required String title,

lib/components/pages/traction/traction.dart

@@ -1,13 +1,17 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:typed_data';
 
+import 'package:file_selector/file_selector.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mileograph_flutter/components/traction/traction_card.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/api_service.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
+import 'package:mileograph_flutter/utils/download_helper.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 

lib/components/pages/traction/traction_page.dart

@@ -1,14 +1,32 @@
 part of 'traction.dart';
 
+enum _TractionMoreAction {
+  classStats,
+  classLeaderboard,
+  adminPending,
+  adminPendingChanges,
+  adminImport,
+}
+
 class TractionPage extends StatefulWidget {
   const TractionPage({
     super.key,
     this.selectionMode = false,
+    this.selectionSingle = false,
+    this.replacementPendingLocoId,
+    this.transferFromLabel,
+    this.transferFromLocoId,
+    this.transferAllAllocations = false,
     this.onSelect,
     this.selectedKeys = const {},
   });
 
   final bool selectionMode;
+  final bool selectionSingle;
+  final int? replacementPendingLocoId;
+  final String? transferFromLabel;
+  final int? transferFromLocoId;
+  final bool transferAllAllocations;
   final ValueChanged<LocoSummary>? onSelect;
   final Set<String> selectedKeys;
 
@@ -23,6 +41,13 @@ class _TractionPageState extends State<TractionPage> {
   final _nameController = TextEditingController();
   bool _mileageFirst = true;
   bool _initialised = false;
+  int? get _transferFromLocoId => widget.transferFromLocoId;
+  bool get _transferAllAllocations {
+    if (widget.transferAllAllocations) return true;
+    final param =
+        GoRouterState.of(context).uri.queryParameters['transferAll'];
+    return param?.toLowerCase() == 'true' || param == '1';
+  }
   bool _showAdvancedFilters = false;
   String? _selectedClass;
   late Set<String> _selectedKeys;
@@ -48,6 +73,9 @@ class _TractionPageState extends State<TractionPage> {
   static const int _pageSize = 100;
   int _lastTractionOffset = 0;
   String? _lastQuerySignature;
+  String? _transferFromLabel;
+  bool _isSearching = false;
+  bool _classExporting = false;
 
   @override
   void initState() {
@@ -61,6 +89,7 @@ class _TractionPageState extends State<TractionPage> {
     if (!_initialised) {
       _initialised = true;
       _selectedKeys = {...widget.selectedKeys};
+      _transferFromLabel = widget.transferFromLabel;
       WidgetsBinding.instance.addPostFrameCallback((_) {
         _initialLoad();
       });
@@ -69,12 +98,16 @@ class _TractionPageState extends State<TractionPage> {
 
   Future<void> _initialLoad() async {
     final data = context.read<DataService>();
+    final auth = context.read<AuthService>();
     await _restoreSearchState();
     if (_lastTractionOffset == 0 && data.traction.length > _pageSize) {
       _lastTractionOffset = data.traction.length - _pageSize;
     }
     data.fetchClassList();
     data.fetchEventFields();
+    if (auth.isElevated) {
+      unawaited(data.fetchPendingLocoCount());
+    }
     await _refreshTraction();
   }
 
@@ -140,6 +173,7 @@ class _TractionPageState extends State<TractionPage> {
     bool append = false,
     bool preservePosition = true,
   }) async {
+    _setState(() => _isSearching = true);
     final data = context.read<DataService>();
     final filters = <String, dynamic>{};
     final name = _nameController.text.trim();
@@ -198,6 +232,7 @@ class _TractionPageState extends State<TractionPage> {
     }
 
     await _persistSearchState();
+    _setState(() => _isSearching = false);
   }
 
   void _clearFilters() {
@@ -296,6 +331,7 @@ class _TractionPageState extends State<TractionPage> {
     final isMobile = MediaQuery.of(context).size.width < 700;
     _syncControllersForFields(data.eventFields);
     final extraFields = _activeEventFields(data.eventFields);
+    final transferBanner = _buildTransferBanner(data);
 
     final slivers = <Widget>[
       SliverPadding(
@@ -325,6 +361,10 @@ class _TractionPageState extends State<TractionPage> {
                   _buildHeaderActions(context, isMobile),
                 ],
               ),
+              if (transferBanner != null) ...[
+                const SizedBox(height: 8),
+                transferBanner,
+              ],
               const SizedBox(height: 12),
               Card(
                 child: Padding(
@@ -474,8 +514,25 @@ class _TractionPageState extends State<TractionPage> {
                           ),
                           ElevatedButton.icon(
                             onPressed: _refreshTraction,
-                            icon: const Icon(Icons.search),
-                            label: const Text('Search'),
+                            icon: (_isSearching || data.isTractionLoading)
+                                ? SizedBox(
+                                    width: 16,
+                                    height: 16,
+                                    child: CircularProgressIndicator(
+                                      strokeWidth: 2,
+                                      valueColor: AlwaysStoppedAnimation<Color>(
+                                        Theme.of(context)
+                                            .colorScheme
+                                            .onPrimary,
+                                      ),
+                                    ),
+                                  )
+                                : const Icon(Icons.search),
+                            label: Text(
+                              (_isSearching || data.isTractionLoading)
+                                  ? 'Searching...'
+                                  : 'Search',
+                            ),
                           ),
                         ],
                       ),
@@ -594,44 +651,47 @@ class _TractionPageState extends State<TractionPage> {
     return content;
   }
 
+  String get _currentClassLabel =>
+      (_selectedClass ?? _classController.text).trim();
+
   bool get _hasClassQuery {
-    return (_selectedClass ?? _classController.text).trim().isNotEmpty;
+    return _currentClassLabel.isNotEmpty;
   }
 
   Widget _buildHeaderActions(BuildContext context, bool isMobile) {
     final isElevated = context.read<AuthService>().isElevated;
+    final data = context.watch<DataService>();
+    final pendingCount = data.pendingLocoCount;
+    String? pendingLabel;
+    if (pendingCount > 0) {
+      pendingLabel = pendingCount > 999 ? '999+' : pendingCount.toString();
+    }
     final refreshButton = IconButton(
       tooltip: 'Refresh',
       onPressed: _refreshTraction,
       icon: const Icon(Icons.refresh),
     );
 
-    final classStatsButton = !_hasClassQuery
+    final hasClassActions = _hasClassQuery;
+    final classLabel = _currentClassLabel;
+
+    final exportClassButton = !hasClassActions
         ? null
         : FilledButton.tonalIcon(
-            onPressed: _toggleClassStatsPanel,
-            icon: Icon(
-              _showClassStatsPanel ? Icons.bar_chart : Icons.insights,
-            ),
+            onPressed: _classExporting ? null : _exportSelectedClass,
+            icon: _classExporting
+                ? const SizedBox(
+                    height: 16,
+                    width: 16,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  )
+                : const Icon(Icons.download),
             label: Text(
-              _showClassStatsPanel ? 'Hide class stats' : 'Class stats',
-            ),
-          );
-    final classLeaderboardButton = !_hasClassQuery
-        ? null
-        : FilledButton.tonalIcon(
-            onPressed: _toggleClassLeaderboardPanel,
-            icon: Icon(
-              _showClassLeaderboardPanel ? Icons.emoji_events : Icons.leaderboard,
-            ),
-            label: Text(
-              _showClassLeaderboardPanel ? 'Hide class leaderboard' : 'Class leaderboard',
+              _classExporting ? 'Exporting...' : 'Export $classLabel',
             ),
           );
 
-    final newTractionButton = !isElevated
-        ? null
-        : FilledButton.icon(
+    final newTractionButton = FilledButton.icon(
       onPressed: () async {
         final createdClass = await context.push<String>(
           '/traction/new',
@@ -649,17 +709,153 @@ class _TractionPageState extends State<TractionPage> {
       label: const Text('New Traction'),
     );
 
+    final hasAdminActions = isElevated;
+    final hasMoreMenu = hasClassActions || hasAdminActions;
+
+    final moreButton = !hasMoreMenu
+        ? null
+        : PopupMenuButton<_TractionMoreAction>(
+            tooltip: 'More options',
+            onSelected: (action) async {
+              switch (action) {
+                case _TractionMoreAction.classStats:
+                  _toggleClassStatsPanel();
+                  break;
+                case _TractionMoreAction.classLeaderboard:
+                  _toggleClassLeaderboardPanel();
+                  break;
+                case _TractionMoreAction.adminPending:
+                  final messenger = ScaffoldMessenger.of(context);
+                  try {
+                    await context.push('/traction/pending');
+                    if (!mounted) return;
+                    await data.fetchPendingLocoCount();
+                  } catch (_) {
+                    if (!mounted) return;
+                    messenger.showSnackBar(
+                      const SnackBar(
+                        content: Text('Unable to open pending locos'),
+                      ),
+                    );
+                  }
+                  break;
+                case _TractionMoreAction.adminPendingChanges:
+                  final messenger = ScaffoldMessenger.of(context);
+                  try {
+                    await context.push('/traction/changes');
+                  } catch (_) {
+                    if (!mounted) return;
+                    messenger.showSnackBar(
+                      const SnackBar(
+                        content: Text('Unable to open pending changes'),
+                      ),
+                    );
+                  }
+                  break;
+                case _TractionMoreAction.adminImport:
+                  await _showTractionImportSheet();
+                  break;
+              }
+            },
+            itemBuilder: (context) {
+              final items = <PopupMenuEntry<_TractionMoreAction>>[];
+              if (hasClassActions) {
+                items.add(
+                  PopupMenuItem(
+                    value: _TractionMoreAction.classStats,
+                    child: Row(
+                      children: [
+                        Icon(
+                          _showClassStatsPanel ? Icons.check : Icons.check_box_outline_blank,
+                          size: 18,
+                        ),
+                        const SizedBox(width: 8),
+                        const Text('Class stats'),
+                      ],
+                    ),
+                  ),
+                );
+              }
+              if (hasClassActions) {
+                items.add(
+                  PopupMenuItem(
+                    value: _TractionMoreAction.classLeaderboard,
+                    child: Row(
+                      children: [
+                        Icon(
+                          _showClassLeaderboardPanel
+                              ? Icons.check
+                              : Icons.check_box_outline_blank,
+                          size: 18,
+                        ),
+                        const SizedBox(width: 8),
+                        const Text('Class leaderboard'),
+                      ],
+                    ),
+                  ),
+                );
+              }
+              if (items.isNotEmpty && hasAdminActions) {
+                items.add(const PopupMenuDivider());
+              }
+              if (hasAdminActions) {
+                items.add(
+                  PopupMenuItem(
+                    value: _TractionMoreAction.adminPending,
+                    child: Row(
+                      children: [
+                        const Text('Pending locos'),
+                        const Spacer(),
+                        if (pendingLabel != null)
+                          _countChip(context, pendingLabel),
+                      ],
+                    ),
+                  ),
+                );
+                items.add(
+                  const PopupMenuItem(
+                    value: _TractionMoreAction.adminPendingChanges,
+                    child: Text('Pending changes'),
+                  ),
+                );
+                items.add(
+                  const PopupMenuItem(
+                    value: _TractionMoreAction.adminImport,
+                    child: Text('Import traction'),
+                  ),
+                );
+              }
+              return items;
+            },
+            child: IgnorePointer(
+              child: FilledButton.tonalIcon(
+                onPressed: () {},
+                icon: const Icon(Icons.more_horiz),
+                label: Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    const Text('More'),
+                    if (pendingLabel != null) ...[
+                      const SizedBox(width: 6),
+                      _countChip(context, pendingLabel),
+                    ],
+                  ],
+                ),
+              ),
+            ),
+          );
+
     final desktopActions = [
       refreshButton,
-      if (classStatsButton != null) classStatsButton,
-      if (classLeaderboardButton != null) classLeaderboardButton,
-      if (newTractionButton != null) newTractionButton,
+      if (exportClassButton != null) exportClassButton,
+      newTractionButton,
+      if (moreButton != null) moreButton,
     ];
 
     final mobileActions = [
-      if (newTractionButton != null) newTractionButton,
-      if (classStatsButton != null) classStatsButton,
-      if (classLeaderboardButton != null) classLeaderboardButton,
+      if (moreButton != null) moreButton,
+      if (exportClassButton != null) exportClassButton,
+      newTractionButton,
       refreshButton,
     ];
 
@@ -686,6 +882,331 @@ class _TractionPageState extends State<TractionPage> {
     );
   }
 
+  Future<void> _exportSelectedClass() async {
+    if (_classExporting) return;
+    final classLabel = _currentClassLabel;
+    if (classLabel.isEmpty) return;
+    setState(() => _classExporting = true);
+    final messenger = ScaffoldMessenger.of(context);
+    try {
+      final data = context.read<DataService>();
+      final encodedClass = Uri.encodeComponent(classLabel);
+      final response = await data.api.getBytes(
+        '/loco/class/export/$encodedClass',
+        headers: const {'accept': '*/*'},
+      );
+      final safeClassName =
+          classLabel.replaceAll(RegExp(r'[^a-zA-Z0-9-_]+'), '_');
+      final fallbackName = 'traction-${safeClassName.isEmpty ? 'class' : safeClassName}.xlsx';
+      final filename = response.filename ?? fallbackName;
+      final saveResult = await saveBytes(
+        Uint8List.fromList(response.bytes),
+        filename,
+        mimeType: response.contentType,
+      );
+      if (!mounted) return;
+      if (saveResult.canceled) {
+        messenger.showSnackBar(
+          const SnackBar(content: Text('Export canceled.')),
+        );
+      } else {
+        final path = saveResult.path;
+        messenger.showSnackBar(
+          SnackBar(
+            content: Text(
+              path == null || path.isEmpty
+                  ? 'Export started.'
+                  : 'Export saved to $path',
+            ),
+          ),
+        );
+      }
+    } on ApiException catch (e) {
+      if (!mounted) return;
+      messenger.showSnackBar(
+        SnackBar(content: Text('Export failed: ${e.message}')),
+      );
+    } catch (e) {
+      if (!mounted) return;
+      messenger.showSnackBar(
+        SnackBar(content: Text('Export failed: $e')),
+      );
+    } finally {
+      if (mounted) setState(() => _classExporting = false);
+    }
+  }
+
+  Future<void> _showTractionImportSheet() async {
+    final isElevated = context.read<AuthService>().isElevated;
+    if (!isElevated) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Import is available to admins only.')),
+      );
+      return;
+    }
+
+    XFile? selectedFile;
+    bool uploading = false;
+    Map<String, dynamic>? importResult;
+    String? statusMessage;
+    String? errorMessage;
+
+    await showModalBottomSheet<void>(
+      context: context,
+      isScrollControlled: true,
+      builder: (sheetContext) {
+        final theme = Theme.of(sheetContext);
+        return StatefulBuilder(
+          builder: (context, setModalState) {
+            Future<void> pickFile() async {
+              final file = await openFile(
+                acceptedTypeGroups: const [
+                  XTypeGroup(
+                    label: 'Spreadsheets',
+                    extensions: ['xlsx', 'xls', 'ods', 'odf'],
+                  ),
+                ],
+              );
+              if (file == null) return;
+              setModalState(() {
+                selectedFile = file;
+                importResult = null;
+                statusMessage = null;
+                errorMessage = null;
+              });
+            }
+
+            Future<void> uploadFile() async {
+              final file = selectedFile;
+              if (file == null || uploading) return;
+              setModalState(() {
+                uploading = true;
+                importResult = null;
+                statusMessage = null;
+                errorMessage = null;
+              });
+              try {
+                final data = context.read<DataService>();
+                final bytes = await file.readAsBytes();
+                final response = await data.api.postMultipartFile(
+                  '/loco/class/import',
+                  bytes: bytes,
+                  filename: file.name,
+                  headers: const {'accept': 'application/json'},
+                );
+                if (!mounted) return;
+                final parsed = response is Map
+                    ? Map<String, dynamic>.from(response)
+                    : null;
+                if (parsed != null) {
+                  final imported = _importCount(parsed['imported']);
+                  final updated = _importCount(parsed['updated']);
+                  final errors = _importErrors(parsed);
+                  final errorNote =
+                      errors.isNotEmpty ? ' (${errors.length} error(s))' : '';
+                  statusMessage =
+                      'Import complete. Imported $imported, updated $updated$errorNote.';
+                  importResult = parsed;
+                } else {
+                  statusMessage = 'Import complete.';
+                }
+                await data.fetchClassList();
+                await _refreshTraction(preservePosition: true);
+              } on ApiException catch (e) {
+                if (!mounted) return;
+                errorMessage = e.message;
+              } catch (e) {
+                if (!mounted) return;
+                errorMessage = e.toString();
+              } finally {
+                if (!mounted) return;
+                setModalState(() => uploading = false);
+              }
+            }
+
+            return SafeArea(
+              child: Padding(
+                padding: EdgeInsets.fromLTRB(
+                  16,
+                  16,
+                  16,
+                  16 + MediaQuery.of(context).viewInsets.bottom,
+                ),
+                child: SingleChildScrollView(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text(
+                        'Import traction data',
+                        style: theme.textTheme.titleLarge,
+                      ),
+                      const SizedBox(height: 8),
+                      Text(
+                        'Upload a spreadsheet to import traction records.',
+                        style: theme.textTheme.bodyMedium,
+                      ),
+                      const SizedBox(height: 12),
+                      Row(
+                        children: [
+                          Expanded(
+                            child: Text(
+                              selectedFile?.name ?? 'No file selected',
+                              overflow: TextOverflow.ellipsis,
+                            ),
+                          ),
+                          const SizedBox(width: 8),
+                          OutlinedButton.icon(
+                            onPressed: uploading ? null : pickFile,
+                            icon: const Icon(Icons.upload_file),
+                            label: const Text('Choose file'),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 12),
+                      FilledButton.icon(
+                        onPressed:
+                            selectedFile == null || uploading ? null : uploadFile,
+                        icon: uploading
+                            ? const SizedBox(
+                                width: 16,
+                                height: 16,
+                                child: CircularProgressIndicator(strokeWidth: 2),
+                              )
+                            : const Icon(Icons.file_upload),
+                        label: Text(
+                          uploading ? 'Importing...' : 'Upload and import',
+                        ),
+                      ),
+                      if (statusMessage != null) ...[
+                        const SizedBox(height: 12),
+                        Text(
+                          statusMessage!,
+                          style: theme.textTheme.bodyMedium,
+                        ),
+                      ],
+                      if (errorMessage != null) ...[
+                        const SizedBox(height: 12),
+                        Text(
+                          errorMessage!,
+                          style: theme.textTheme.bodyMedium?.copyWith(
+                            color: theme.colorScheme.error,
+                          ),
+                        ),
+                      ],
+                      if (importResult != null)
+                        _buildImportSummary(context, importResult!),
+                    ],
+                  ),
+                ),
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+
+  int _importCount(dynamic value) {
+    if (value is num) return value.toInt();
+    return int.tryParse(value?.toString() ?? '') ?? 0;
+  }
+
+  List<dynamic> _importErrors(Map<String, dynamic> result) {
+    final errors = result['errors'];
+    if (errors == null) return const [];
+    if (errors is List) return errors;
+    return [errors];
+  }
+
+  String _stringifyImportError(dynamic err) {
+    if (err == null) return '';
+    if (err is String) return err;
+    try {
+      return jsonEncode(err);
+    } catch (_) {
+      return err.toString();
+    }
+  }
+
+  Widget _buildImportSummary(
+    BuildContext context,
+    Map<String, dynamic> result,
+  ) {
+    final imported = _importCount(result['imported']);
+    final updated = _importCount(result['updated']);
+    final errors = _importErrors(result);
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        const SizedBox(height: 12),
+        Text(
+          'Import summary',
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
+        const SizedBox(height: 8),
+        Wrap(
+          spacing: 12,
+          runSpacing: 8,
+          children: [
+            _buildImportChip(context, 'Imported', imported.toString()),
+            _buildImportChip(context, 'Updated', updated.toString()),
+            _buildImportChip(context, 'Errors', errors.length.toString()),
+          ],
+        ),
+        if (errors.isNotEmpty) ...[
+          const SizedBox(height: 8),
+          Text(
+            'Errors',
+            style: Theme.of(context).textTheme.labelLarge,
+          ),
+          const SizedBox(height: 6),
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: errors
+                .map(
+                  (err) => Padding(
+                    padding: const EdgeInsets.only(bottom: 4),
+                    child: Text(_stringifyImportError(err)),
+                  ),
+                )
+                .toList(),
+          ),
+        ],
+      ],
+    );
+  }
+
+  Widget _buildImportChip(
+    BuildContext context,
+    String label,
+    String value,
+  ) {
+    final scheme = Theme.of(context).colorScheme;
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+      decoration: BoxDecoration(
+        color: scheme.surfaceContainerHighest,
+        borderRadius: BorderRadius.circular(8),
+        border: Border.all(color: scheme.outlineVariant),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            label,
+            style: Theme.of(context).textTheme.labelSmall,
+          ),
+          const SizedBox(height: 4),
+          Text(
+            value,
+            style: const TextStyle(fontWeight: FontWeight.w700),
+          ),
+        ],
+      ),
+    );
+  }
+
   Future<void> _toggleClassStatsPanel() async {
     if (!_hasClassQuery) return;
     final targetState = !_showClassStatsPanel;
@@ -1054,6 +1575,12 @@ class _TractionPageState extends State<TractionPage> {
     if (widget.onSelect != null) {
       widget.onSelect!(loco);
     }
+    if (widget.selectionMode && widget.selectionSingle) {
+      if (mounted) {
+        context.pop(loco);
+      }
+      return;
+    }
     setState(() {
       if (_selectedKeys.contains(keyVal)) {
         _selectedKeys.remove(keyVal);
@@ -1063,6 +1590,169 @@ class _TractionPageState extends State<TractionPage> {
     });
   }
 
+  Future<void> _confirmReplacePending(LocoSummary replacement) async {
+    final pendingId = widget.replacementPendingLocoId;
+    if (pendingId == null) return;
+    final navContext = context;
+    final messenger = ScaffoldMessenger.of(navContext);
+    String rejectionReason = '';
+    final confirmed = await showDialog<bool>(
+      context: navContext,
+      builder: (dialogContext) {
+        return StatefulBuilder(
+          builder: (context, setState) {
+            final canSubmit = rejectionReason.trim().isNotEmpty;
+            return AlertDialog(
+              title: const Text('Replace pending loco?'),
+              content: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    'Replace pending loco with ${replacement.locoClass} ${replacement.number}?',
+                  ),
+                  const SizedBox(height: 12),
+                  TextField(
+                    autofocus: true,
+                    maxLines: 2,
+                    decoration: const InputDecoration(
+                      labelText: 'Rejection reason',
+                      hintText: 'Reason for replacing this loco',
+                    ),
+                    onChanged: (val) => setState(() {
+                      rejectionReason = val;
+                    }),
+                  ),
+                ],
+              ),
+              actions: [
+                TextButton(
+                  onPressed: () => Navigator.of(dialogContext).pop(false),
+                  child: const Text('Cancel'),
+                ),
+                FilledButton(
+                  onPressed:
+                      canSubmit ? () => Navigator.of(dialogContext).pop(true) : null,
+                  child: const Text('Replace'),
+                ),
+              ],
+            );
+          },
+        );
+      },
+    );
+    if (confirmed != true) return;
+    if (!navContext.mounted) return;
+    try {
+      final data = navContext.read<DataService>();
+      await data.rejectPendingLoco(
+            locoId: pendingId,
+            replacementLocoId: replacement.id,
+            rejectedReason: rejectionReason,
+          );
+      if (navContext.mounted) {
+        messenger.showSnackBar(
+          const SnackBar(content: Text('Pending loco replaced')),
+        );
+        navContext.pop();
+      }
+    } catch (e) {
+      if (navContext.mounted) {
+        messenger.showSnackBar(
+          SnackBar(content: Text('Failed to replace loco: $e')),
+        );
+      }
+    }
+  }
+
+  Future<void> _confirmTransfer(LocoSummary target) async {
+    final fromId = _transferFromLocoId;
+    if (fromId == null) return;
+    final navContext = context;
+    final messenger = ScaffoldMessenger.of(navContext);
+    final data = navContext.read<DataService>();
+    final fromLoco = data.traction.firstWhere(
+      (l) => l.id == fromId,
+      orElse: () => target,
+    );
+    final fromLabel = '${fromLoco.locoClass} ${fromLoco.number}'.trim();
+    final toLabel = '${target.locoClass} ${target.number}'.trim();
+    final confirmed = await showDialog<bool>(
+      context: navContext,
+      builder: (dialogContext) {
+        return AlertDialog(
+          title: Text(
+            _transferAllAllocations
+                ? 'Transfer all allocations?'
+                : 'Transfer allocations?',
+          ),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                _transferAllAllocations
+                    ? 'Transfer all user allocations from $fromLabel to $toLabel?'
+                    : 'Transfer all allocations from $fromLabel to $toLabel?',
+              ),
+              const SizedBox(height: 12),
+              Text(
+                'From: $fromLabel',
+                style: Theme.of(dialogContext)
+                    .textTheme
+                    .bodyMedium
+                    ?.copyWith(fontWeight: FontWeight.w700),
+              ),
+              Text('To: $toLabel'),
+            ],
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.of(dialogContext).pop(false),
+              child: const Text('Cancel'),
+            ),
+            FilledButton(
+              onPressed: () => Navigator.of(dialogContext).pop(true),
+              child: const Text('Transfer'),
+            ),
+          ],
+        );
+      },
+    );
+    if (confirmed != true) return;
+    if (!navContext.mounted) return;
+    try {
+      final data = navContext.read<DataService>();
+      if (_transferAllAllocations) {
+        await data.transferAllAllocations(
+          fromLocoId: fromId,
+          toLocoId: target.id,
+        );
+      } else {
+        await data.transferAllocations(fromLocoId: fromId, toLocoId: target.id);
+      }
+      if (navContext.mounted) {
+        messenger.showSnackBar(
+          SnackBar(
+            content: Text(
+              _transferAllAllocations
+                  ? 'All allocations transferred'
+                  : 'Allocations transferred',
+            ),
+          ),
+        );
+      }
+      await _refreshTraction(preservePosition: true);
+      if (navContext.mounted) navContext.pop();
+    } catch (e) {
+      if (navContext.mounted) {
+        messenger.showSnackBar(
+          SnackBar(content: Text('Failed to transfer allocations: $e')),
+        );
+      }
+    }
+  }
+
   bool _isSelected(LocoSummary loco) {
     final keyVal = '${loco.locoClass}-${loco.number}';
     return _selectedKeys.contains(keyVal);
@@ -1086,6 +1776,71 @@ class _TractionPageState extends State<TractionPage> {
     );
   }
 
+  Widget? _buildTransferBanner(DataService data) {
+    final fromId = _transferFromLocoId;
+    if (fromId == null) return null;
+    if (_transferFromLabel == null || _transferFromLabel!.trim().isEmpty) {
+      final from = data.traction.firstWhere(
+        (loco) => loco.id == fromId,
+        orElse: () => LocoSummary(
+          locoId: fromId,
+          locoType: '',
+          locoNumber: '',
+          locoName: '',
+          locoClass: '',
+          locoOperator: '',
+        ),
+      );
+      final fallbackLabel = '${from.locoClass} ${from.number}'.trim().isEmpty
+          ? 'Loco $fromId'
+          : '${from.locoClass} ${from.number}'.trim();
+      _transferFromLabel = fallbackLabel;
+    }
+    final label = _transferFromLabel ?? 'Loco $fromId';
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: Colors.orange.withValues(alpha: 0.1),
+        borderRadius: BorderRadius.circular(8),
+        border: Border.all(color: Colors.orange.withValues(alpha: 0.4)),
+      ),
+      child: Row(
+        children: [
+          const Icon(Icons.swap_horiz, color: Colors.orange),
+          const SizedBox(width: 8),
+          Expanded(
+            child: Text(
+              _transferAllAllocations
+                  ? 'Transferring all allocations from $label. Select a loco to transfer to.'
+                  : 'Transferring allocations from $label. Select a loco to transfer to.',
+              style: const TextStyle(fontWeight: FontWeight.w600),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _countChip(BuildContext context, String label) {
+    final scheme = Theme.of(context).colorScheme;
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+      decoration: BoxDecoration(
+        color: scheme.primary,
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Text(
+        label,
+        style: TextStyle(
+          color: scheme.onPrimary,
+          fontWeight: FontWeight.w700,
+          fontSize: 12,
+        ),
+      ),
+    );
+  }
+
   Widget _buildFilterInput(
     BuildContext context,
     EventField field,
@@ -1199,11 +1954,33 @@ class _TractionPageState extends State<TractionPage> {
                 loco: loco,
                 selectionMode: widget.selectionMode,
                 isSelected: _isSelected(loco),
-              onShowInfo: () => showTractionDetails(context, loco),
+                onShowInfo: () => showTractionDetails(
+                  context,
+                  loco,
+                  onActionComplete: () => _refreshTraction(preservePosition: true),
+                ),
                 onOpenTimeline: () => _openTimeline(loco),
                 onOpenLegs: () => _openLegs(loco),
-              onToggleSelect:
-                  widget.selectionMode ? () => _toggleSelection(loco) : null,
+                onActionComplete: _refreshTraction,
+                onToggleSelect: widget.selectionMode &&
+                        widget.replacementPendingLocoId == null &&
+                        (widget.transferFromLocoId == null ||
+                            widget.transferFromLocoId != loco.id)
+                    ? () => _toggleSelection(loco)
+                    : null,
+                onReplacePending: widget.selectionMode &&
+                        widget.selectionSingle &&
+                        widget.replacementPendingLocoId != null &&
+                        (widget.transferFromLocoId == null ||
+                            widget.transferFromLocoId != loco.id)
+                    ? () => _confirmReplacePending(loco)
+                    : null,
+                onTransferAllocations: widget.selectionMode &&
+                        widget.selectionSingle &&
+                        widget.transferFromLocoId != null &&
+                        widget.transferFromLocoId != loco.id
+                    ? () => _confirmTransfer(loco)
+                    : null,
               );
           }
 

lib/components/pages/traction/traction_pending_changes_page.dart

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

lib/components/pages/traction/traction_pending_page.dart

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

lib/components/traction/traction_card.dart

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

@@ -0,0 +1,81 @@
+import 'package:flutter/material.dart';
+
+class AnimatedCountText extends StatefulWidget {
+  const AnimatedCountText({
+    super.key,
+    required this.value,
+    required this.formatter,
+    this.style,
+    this.duration = const Duration(milliseconds: 900),
+    this.curve = Curves.easeOutCubic,
+    this.animateFromZero = true,
+  });
+
+  final double value;
+  final String Function(double) formatter;
+  final TextStyle? style;
+  final Duration duration;
+  final Curve curve;
+  final bool animateFromZero;
+
+  @override
+  State<AnimatedCountText> createState() => _AnimatedCountTextState();
+}
+
+class _AnimatedCountTextState extends State<AnimatedCountText>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _controller;
+  late Animation<double> _animation;
+  late CurvedAnimation _curve;
+  double _currentValue = 0;
+
+  @override
+  void initState() {
+    super.initState();
+    _currentValue = widget.animateFromZero ? 0 : widget.value;
+    _controller = AnimationController(vsync: this, duration: widget.duration);
+    _curve = CurvedAnimation(parent: _controller, curve: widget.curve);
+    _controller.addListener(_handleTick);
+    _configureAnimation(from: _currentValue, to: widget.value);
+    if (_currentValue != widget.value) {
+      _controller.forward();
+    }
+  }
+
+  @override
+  void didUpdateWidget(covariant AnimatedCountText oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.curve != widget.curve) {
+      _curve = CurvedAnimation(parent: _controller, curve: widget.curve);
+      _configureAnimation(from: _currentValue, to: widget.value);
+    }
+    if (oldWidget.value != widget.value) {
+      _controller.duration = widget.duration;
+      _configureAnimation(from: _currentValue, to: widget.value);
+      _controller.forward(from: 0);
+    }
+  }
+
+  void _configureAnimation({required double from, required double to}) {
+    _animation = Tween<double>(begin: from, end: to).animate(_curve);
+  }
+
+  void _handleTick() {
+    setState(() => _currentValue = _animation.value);
+  }
+
+  @override
+  void dispose() {
+    _controller.removeListener(_handleTick);
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Text(
+      widget.formatter(_currentValue),
+      style: widget.style,
+    );
+  }
+}

lib/components/widgets/leg_share_edit_notification_card.dart

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

lib/components/widgets/leg_share_notification_card.dart

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

lib/objects/objects.dart

@@ -519,6 +519,8 @@ class StatsAbout {
     final networkByYear = <int, List<StatsNetworkMileage>>{};
     final stationByYear = <int, List<StatsStationVisits>>{};
     final winnersByYear = <int, int>{};
+    final winnerTypeCountsByYear = <int, Map<String, int>>{};
+    final totalTypeCountsByYear = <int, Map<String, int>>{};
 
     void addYearMileage(dynamic entry) {
       if (entry is Map<String, dynamic>) {
@@ -589,6 +591,16 @@ class StatsAbout {
       }
     }
 
+    Map<String, int> parseTypeCounts(dynamic value) {
+      if (value is Map) {
+        final entries = value.entries
+            .map((entry) => MapEntry(entry.key.toString(), _asInt(entry.value)))
+            .where((entry) => entry.key.isNotEmpty);
+        return Map<String, int>.fromEntries(entries);
+      }
+      return const {};
+    }
+
     parseYearMap<List<StatsClassMileage>>(
       json['top_classes'],
       classByYear,
@@ -610,6 +622,19 @@ class StatsAbout {
         if (year == null) return;
         if (value is List) {
           winnersByYear[year] = value.length;
+        } else if (value is Map) {
+          final mapped = value.map(
+            (entryKey, entryValue) =>
+                MapEntry(entryKey.toString(), entryValue),
+          );
+          final winners = mapped['winners'];
+          if (winners is List) {
+            winnersByYear[year] = winners.length;
+          }
+          winnerTypeCountsByYear[year] =
+              parseTypeCounts(mapped['winner_type_counts']);
+          totalTypeCountsByYear[year] =
+              parseTypeCounts(mapped['total_type_counts']);
         }
       });
     }
@@ -620,6 +645,8 @@ class StatsAbout {
       ...networkByYear.keys,
       ...stationByYear.keys,
       ...winnersByYear.keys,
+      ...winnerTypeCountsByYear.keys,
+      ...totalTypeCountsByYear.keys,
     }..removeWhere((year) => year == 0);
 
     final yearMap = <int, StatsYear>{};
@@ -631,6 +658,8 @@ class StatsAbout {
         topNetworks: networkByYear[year] ?? const [],
         topStations: stationByYear[year] ?? const [],
         winnerCount: winnersByYear[year] ?? 0,
+        winnerTypeCounts: winnerTypeCountsByYear[year] ?? const {},
+        totalTypeCounts: totalTypeCountsByYear[year] ?? const {},
       );
     }
 
@@ -651,6 +680,8 @@ class StatsYear {
   final List<StatsNetworkMileage> topNetworks;
   final List<StatsStationVisits> topStations;
   final int winnerCount;
+  final Map<String, int> winnerTypeCounts;
+  final Map<String, int> totalTypeCounts;
 
   StatsYear({
     required this.year,
@@ -659,6 +690,8 @@ class StatsYear {
     required this.topNetworks,
     required this.topStations,
     required this.winnerCount,
+    required this.winnerTypeCounts,
+    required this.totalTypeCounts,
   });
 }
 
@@ -753,6 +786,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 +808,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 +847,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 +877,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 +901,8 @@ class LocoAttrVersion {
     this.precisionLevel,
     this.maskedValidFrom,
     this.valueNorm,
+    this.isPending = false,
+    this.canModeratePending = false,
   });
 
   factory LocoAttrVersion.fromJson(Map<String, dynamic> json) {
@@ -881,6 +927,8 @@ class LocoAttrVersion {
       precisionLevel: json['precision_level']?.toString(),
       maskedValidFrom: json['masked_valid_from']?.toString(),
       valueNorm: json['value_norm'],
+      isPending: json['is_pending'] == true,
+      canModeratePending: json['can_moderate_pending'] == true,
     );
   }
 
@@ -916,15 +964,19 @@ class LocoAttrVersion {
       });
     }
     items.sort(
-      (a, b) {
-        final aDate = a.validFrom ?? a.txnFrom ?? DateTime.fromMillisecondsSinceEpoch(0);
-        final bDate = b.validFrom ?? b.txnFrom ?? DateTime.fromMillisecondsSinceEpoch(0);
+      compareByStart,
+    );
+    return items;
+  }
+
+  static int compareByStart(LocoAttrVersion a, LocoAttrVersion b) {
+    final aDate =
+        a.validFrom ?? a.txnFrom ?? DateTime.fromMillisecondsSinceEpoch(0);
+    final bDate =
+        b.validFrom ?? b.txnFrom ?? DateTime.fromMillisecondsSinceEpoch(0);
     final dateCompare = aDate.compareTo(bDate);
     if (dateCompare != 0) return dateCompare;
     return a.attrCode.compareTo(b.attrCode);
-      },
-    );
-    return items;
   }
 
   String get valueLabel {
@@ -1760,12 +1812,18 @@ class ClassClearanceProgress {
   final int completed;
   final int total;
   final double percentComplete;
+  final int activeCompleted;
+  final int activeTotal;
+  final double activePercent;
 
   ClassClearanceProgress({
     required this.className,
     required this.completed,
     required this.total,
     required this.percentComplete,
+    required this.activeCompleted,
+    required this.activeTotal,
+    required this.activePercent,
   });
 
   factory ClassClearanceProgress.fromJson(Map<String, dynamic> json) {
@@ -1783,11 +1841,34 @@ class ClassClearanceProgress {
     if (percent == 0 && total > 0) {
       percent = (completed / total) * 100;
     }
+    final activeCompleted = _asInt(
+      json['active_completed'] ??
+          json['active_done'] ??
+          json['active_count'] ??
+          json['active_had'] ??
+          json['had_active'],
+    );
+    final activeTotal =
+        _asInt(json['active_total'] ??
+            json['active_required'] ??
+            json['active_goal'] ??
+            json['total_active']);
+    double activePercent = _asDouble(
+      json['active_percent'] ??
+          json['active_pct'] ??
+          json['active_completion'],
+    );
+    if (activePercent == 0 && activeTotal > 0) {
+      activePercent = (activeCompleted / activeTotal) * 100;
+    }
     return ClassClearanceProgress(
       className: name.isNotEmpty ? name : 'Class',
       completed: completed,
       total: total,
       percentComplete: percent,
+      activeCompleted: activeCompleted,
+      activeTotal: activeTotal,
+      activePercent: activePercent,
     );
   }
 }

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/api_service.dart

@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'package:http/http.dart' as http;
 
 typedef TokenProvider = String? Function();
-typedef UnauthorizedHandler = Future<void> Function();
+typedef UnauthorizedHandler = Future<bool> Function();
 
 class ApiService {
   String _baseUrl;
@@ -36,52 +36,143 @@ class ApiService {
     _client.close();
   }
 
-  Map<String, String> _buildHeaders(Map<String, String>? extra) {
+  Map<String, String> _buildHeaders(
+    Map<String, String>? extra, {
+    bool includeAuth = true,
+  }) {
     final token = _getToken?.call();
     final headers = {'accept': 'application/json', ...?extra};
-    if (token != null && token.isNotEmpty) {
+    if (includeAuth && token != null && token.isNotEmpty) {
       headers['Authorization'] = 'Bearer $token';
     }
     return headers;
   }
 
-  Future<dynamic> get(String endpoint, {Map<String, String>? headers}) async {
-    final response = await _client
-        .get(
+  Future<dynamic> get(
+    String endpoint, {
+    Map<String, String>? headers,
+    bool includeAuth = true,
+    bool allowRetry = true,
+  }) async {
+    final response = await _sendWithRetry(
+      () => _client.get(
         Uri.parse('$baseUrl$endpoint'),
-          headers: _buildHeaders(headers),
-        )
-        .timeout(timeout);
+        headers: _buildHeaders(headers, includeAuth: includeAuth),
+      ),
+      allowRetry: allowRetry,
+    );
     return _processResponse(response);
   }
 
+  Future<ApiBinaryResponse> getBytes(
+    String endpoint, {
+    Map<String, String>? headers,
+    bool includeAuth = true,
+    bool allowRetry = true,
+  }) async {
+    final response = await _sendWithRetry(
+      () => _client.get(
+        Uri.parse('$baseUrl$endpoint'),
+        headers: _buildHeaders(headers, includeAuth: includeAuth),
+      ),
+      allowRetry: allowRetry,
+    );
+
+    if (response.statusCode >= 200 && response.statusCode < 300) {
+      final contentDisposition = response.headers['content-disposition'];
+      return ApiBinaryResponse(
+        bytes: response.bodyBytes,
+        statusCode: response.statusCode,
+        contentType: response.headers['content-type'],
+        filename: _extractFilename(contentDisposition),
+      );
+    }
+
+    final body = _decodeBody(response);
+    final message = _extractErrorMessage(body);
+    throw ApiException(
+      statusCode: response.statusCode,
+      message: message,
+      body: body,
+    );
+  }
+
   Future<dynamic> post(
     String endpoint,
     dynamic data, {
     Map<String, String>? headers,
+    bool includeAuth = true,
+    bool allowRetry = true,
   }) async {
     final hasBody = data != null;
-    final response = await _client
-        .post(
+    final response = await _sendWithRetry(
+      () => _client.post(
         Uri.parse('$baseUrl$endpoint'),
-          headers: _buildHeaders(hasBody ? _jsonHeaders(headers) : headers),
+        headers: _buildHeaders(
+          hasBody ? _jsonHeaders(headers) : headers,
+          includeAuth: includeAuth,
+        ),
         body: hasBody ? jsonEncode(data) : null,
-        )
-        .timeout(timeout);
+      ),
+      allowRetry: allowRetry,
+    );
     return _processResponse(response);
   }
 
-  Future<dynamic> postForm(String endpoint, Map<String, String> data) async {
-    final response = await _client
-        .post(
+  Future<dynamic> postMultipartFile(
+    String endpoint, {
+    required List<int> bytes,
+    required String filename,
+    String fieldName = 'file',
+    Map<String, String>? fields,
+    Map<String, String>? headers,
+    bool includeAuth = true,
+    bool allowRetry = true,
+  }) async {
+    Future<http.Response> send() async {
+      final request = http.MultipartRequest(
+        'POST',
         Uri.parse('$baseUrl$endpoint'),
-          headers: _buildHeaders({
+      );
+      request.headers.addAll(_buildHeaders(headers, includeAuth: includeAuth));
+      if (fields != null && fields.isNotEmpty) {
+        request.fields.addAll(fields);
+      }
+      request.files.add(
+        http.MultipartFile.fromBytes(
+          fieldName,
+          bytes,
+          filename: filename,
+        ),
+      );
+      final streamed = await _client.send(request);
+      return http.Response.fromStream(streamed);
+    }
+
+    final response = await _sendWithRetry(send, allowRetry: allowRetry);
+    return _processResponse(response);
+  }
+
+  Future<dynamic> postForm(
+    String endpoint,
+    Map<String, String> data, {
+    bool includeAuth = true,
+    bool allowRetry = true,
+  }) async {
+    final response = await _sendWithRetry(
+      () => _client.post(
+        Uri.parse('$baseUrl$endpoint'),
+        headers: _buildHeaders(
+          {
             'Content-Type': 'application/x-www-form-urlencoded',
             'accept': 'application/json',
-          }),
+          },
+          includeAuth: includeAuth,
+        ),
         body: data, // http package handles form-encoding for Map<String, String>
-        )
-        .timeout(timeout);
+      ),
+      allowRetry: allowRetry,
+    );
     return _processResponse(response);
   }
 
@@ -89,28 +180,37 @@ class ApiService {
     String endpoint,
     dynamic data, {
     Map<String, String>? headers,
+    bool includeAuth = true,
+    bool allowRetry = true,
   }) async {
     final hasBody = data != null;
-    final response = await _client
-        .put(
+    final response = await _sendWithRetry(
+      () => _client.put(
         Uri.parse('$baseUrl$endpoint'),
-          headers: _buildHeaders(hasBody ? _jsonHeaders(headers) : headers),
+        headers: _buildHeaders(
+          hasBody ? _jsonHeaders(headers) : headers,
+          includeAuth: includeAuth,
+        ),
         body: hasBody ? jsonEncode(data) : null,
-        )
-        .timeout(timeout);
+      ),
+      allowRetry: allowRetry,
+    );
     return _processResponse(response);
   }
 
   Future<dynamic> delete(
     String endpoint, {
     Map<String, String>? headers,
+    bool includeAuth = true,
+    bool allowRetry = true,
   }) async {
-    final response = await _client
-        .delete(
+    final response = await _sendWithRetry(
+      () => _client.delete(
         Uri.parse('$baseUrl$endpoint'),
-          headers: _buildHeaders(headers),
-        )
-        .timeout(timeout);
+        headers: _buildHeaders(headers, includeAuth: includeAuth),
+      ),
+      allowRetry: allowRetry,
+    );
     return _processResponse(response);
   }
 
@@ -124,10 +224,6 @@ class ApiService {
       return body;
     }
 
-    if (res.statusCode == 401 && _onUnauthorized != null) {
-      await _onUnauthorized!();
-    }
-
     final message = _extractErrorMessage(body);
     throw ApiException(
       statusCode: res.statusCode,
@@ -176,6 +272,34 @@ class ApiService {
     }
     return body.toString();
   }
+
+  Future<http.Response> _sendWithRetry(
+    Future<http.Response> Function() send, {
+    required bool allowRetry,
+  }) async {
+    var response = await send().timeout(timeout);
+    if (response.statusCode == 401 && allowRetry && _onUnauthorized != null) {
+      final refreshed = await _onUnauthorized!();
+      if (refreshed) {
+        response = await send().timeout(timeout);
+      }
+    }
+    return response;
+  }
+
+  String? _extractFilename(String? contentDisposition) {
+    if (contentDisposition == null || contentDisposition.isEmpty) return null;
+    final utf8Match =
+        RegExp(r"filename\\*=UTF-8''([^;]+)", caseSensitive: false)
+            .firstMatch(contentDisposition);
+    if (utf8Match != null) {
+      return Uri.decodeComponent(utf8Match.group(1) ?? '');
+    }
+    final match =
+        RegExp(r'filename="?([^\";]+)"?', caseSensitive: false)
+            .firstMatch(contentDisposition);
+    return match?.group(1);
+  }
 }
 
 class ApiException implements Exception {
@@ -192,3 +316,17 @@ class ApiException implements Exception {
   @override
   String toString() => 'API error $statusCode: $message';
 }
+
+class ApiBinaryResponse {
+  final List<int> bytes;
+  final int statusCode;
+  final String? contentType;
+  final String? filename;
+
+  ApiBinaryResponse({
+    required this.bytes,
+    required this.statusCode,
+    this.contentType,
+    this.filename,
+  });
+}

lib/services/authservice.dart

@@ -6,18 +6,20 @@ import 'package:mileograph_flutter/services/token_storage_service.dart';
 class AuthService extends ChangeNotifier {
   final ApiService api;
   bool _restoring = false;
+  String? _accessToken;
+  Future<bool>? _refreshFuture;
 
   final TokenStorageService _tokenStorage = TokenStorageService();
 
   AuthService({required this.api}) {
     api.setTokenProvider(() => token);
-    api.setUnauthorizedHandler(handleTokenExpired);
+    api.setUnauthorizedHandler(_handleUnauthorized);
   }
 
   AuthenticatedUserData? _user;
 
   bool get isLoggedIn => _user != null;
-  String? get token => _user?.accessToken;
+  String? get token => _accessToken;
   String? get userId => _user?.userId;
   String? get username => _user?.username;
   String? get fullName => _user?.fullName;
@@ -33,11 +35,13 @@ class AuthService extends ChangeNotifier {
     required String fullName,
     required String accessToken,
     required String email,
+    String? refreshToken,
     String entriesVisibility = 'private',
     String mileageVisibility = 'private',
     bool isElevated = false,
     bool isDisabled = false,
   }) {
+    _accessToken = accessToken;
     _user = AuthenticatedUserData(
       userId: userId,
       username: username,
@@ -49,7 +53,7 @@ class AuthService extends ChangeNotifier {
       isElevated: isElevated,
       disabled: isDisabled,
     );
-    _persistToken(accessToken);
+    _persistTokens(accessToken, refreshToken);
     notifyListeners();
   }
 
@@ -64,8 +68,9 @@ class AuthService extends ChangeNotifier {
     };
 
     // 1. Get token
-    final tokenResponse = await api.postForm('/token', formData);
+    final tokenResponse = await api.postForm('/token', formData, includeAuth: false);
     final accessToken = tokenResponse['access_token'];
+    final refreshToken = tokenResponse['refresh_token'];
 
     // 2. Get user details
     final userResponse = await api.get(
@@ -83,6 +88,7 @@ class AuthService extends ChangeNotifier {
       fullName: userResponse['full_name'],
       accessToken: accessToken,
       email: userResponse['email'],
+      refreshToken: refreshToken,
       entriesVisibility: _parseVisibility(
         userResponse['user_entries_visibility'] ?? userResponse['entries_visibility'],
         'private',
@@ -103,20 +109,18 @@ class AuthService extends ChangeNotifier {
       // read token from secure storage (with fallback)
       final token = await _tokenStorage.getToken();
       if (token == null || token.isEmpty) return;
+      _accessToken = token;
 
       final userResponse = await api.get(
         '/users/me',
-        headers: {
-          'Authorization': 'Bearer $token',
-          'accept': 'application/json',
-        },
       );
 
+      final restoredAccessToken = _accessToken ?? token;
       setLoginData(
         userId: userResponse['user_id'],
         username: userResponse['username'],
         fullName: userResponse['full_name'],
-      accessToken: token,
+        accessToken: restoredAccessToken,
         email: userResponse['email'],
         entriesVisibility: _parseVisibility(
           userResponse['user_entries_visibility'] ?? userResponse['entries_visibility'],
@@ -140,12 +144,9 @@ class AuthService extends ChangeNotifier {
     final token = await _tokenStorage.getToken();
     if (token == null || token.isEmpty) return false;
     try {
+      _accessToken = token;
       await api.get(
         '/validate',
-        headers: {
-          'Authorization': 'Bearer $token',
-          'accept': 'application/json',
-        },
       );
       return true;
     } catch (_) {
@@ -154,11 +155,15 @@ class AuthService extends ChangeNotifier {
     }
   }
 
-  Future<void> _persistToken(String token) async {
-    await _tokenStorage.setToken(token);
+  Future<void> _persistTokens(String accessToken, String? refreshToken) async {
+    await _tokenStorage.setToken(accessToken);
+    if (refreshToken != null && refreshToken.isNotEmpty) {
+      await _tokenStorage.setRefreshToken(refreshToken);
+    }
   }
 
   Future<void> _clearToken() async {
+    _accessToken = null;
     await _tokenStorage.clearToken();
   }
 
@@ -181,6 +186,61 @@ class AuthService extends ChangeNotifier {
     await api.postForm('/register', formData);
   }
 
+  Future<bool> _handleUnauthorized() async {
+    if (_refreshFuture != null) {
+      return _refreshFuture!;
+    }
+    _refreshFuture = _refreshTokens();
+    final refreshed = await _refreshFuture!;
+    _refreshFuture = null;
+    return refreshed;
+  }
+
+  Future<bool> _refreshTokens() async {
+    final refreshToken = await _tokenStorage.getRefreshToken();
+    if (refreshToken == null || refreshToken.isEmpty) {
+      await handleTokenExpired();
+      return false;
+    }
+    try {
+      final response = await api.post(
+        '/token/refresh',
+        {'refresh_token': refreshToken},
+        includeAuth: false,
+        allowRetry: false,
+      );
+      final accessToken = response['access_token'];
+      final newRefreshToken = response['refresh_token'];
+      if (accessToken is! String ||
+          accessToken.isEmpty ||
+          newRefreshToken is! String ||
+          newRefreshToken.isEmpty) {
+        await handleTokenExpired();
+        return false;
+      }
+      _accessToken = accessToken;
+      await _persistTokens(accessToken, newRefreshToken);
+      if (_user != null) {
+        _user = AuthenticatedUserData(
+          userId: _user!.userId,
+          username: _user!.username,
+          fullName: _user!.fullName,
+          accessToken: accessToken,
+          email: _user!.email,
+          entriesVisibility: _user!.entriesVisibility,
+          mileageVisibility: _user!.mileageVisibility,
+          isElevated: _user!.isElevated,
+          isDisabled: _user!.disabled,
+        );
+      }
+      notifyListeners();
+      return true;
+    } catch (_) {
+      await handleTokenExpired();
+      return false;
+    }
+  }
+
   Future<void> handleTokenExpired() async {
     _user = null;
     await _clearToken();

lib/services/data_service/data_service_badges.dart

@@ -52,12 +52,15 @@ extension DataServiceBadges on DataService {
     int offset = 0,
     int limit = 20,
     bool append = false,
+    bool onlyIncomplete = false,
   }) async {
     _isClassClearanceProgressLoading = true;
-    if (!append) _classClearanceProgress = [];
     try {
-      final json =
-          await api.get('/badge/completion/class?limit=$limit&offset=$offset');
+      final onlyIncompleteParam =
+          onlyIncomplete ? '&only_incomplete=true' : '';
+      final json = await api.get(
+        '/badge/completion/class?limit=$limit&offset=$offset$onlyIncompleteParam',
+      );
       List<dynamic>? list;
       if (json is List) {
         list = json;
@@ -80,7 +83,6 @@ extension DataServiceBadges on DataService {
       _classClearanceHasMore = items.length >= limit;
     } catch (e) {
       debugPrint('Failed to fetch class clearance progress: $e');
-      if (!append) _classClearanceProgress = [];
       _classClearanceHasMore = false;
     } finally {
       _isClassClearanceProgressLoading = false;

lib/services/data_service/data_service_core.dart

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

lib/services/data_service/data_service_friendships.dart

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

lib/services/data_service/data_service_traction.dart

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

@@ -10,7 +10,8 @@ class TokenStorageService {
 
   factory TokenStorageService() => _instance;
 
-  static const _tokenKey = 'auth_token';
+  static const _accessTokenKey = 'auth_token';
+  static const _refreshTokenKey = 'refresh_token';
   final FlutterSecureStorage _secureStorage = const FlutterSecureStorage();
 
   Future<SharedPreferences> get _prefs async =>
@@ -18,17 +19,17 @@ class TokenStorageService {
 
   Future<void> setToken(String token) async {
     try {
-      await _secureStorage.write(key: _tokenKey, value: token);
+      await _secureStorage.write(key: _accessTokenKey, value: token);
     } catch (_) {
       // ignore secure storage failures in debug/unsupported environments
     }
     final prefs = await _prefs;
-    await prefs.setString(_tokenKey, token);
+    await prefs.setString(_accessTokenKey, token);
   }
 
   Future<String?> getToken() async {
     try {
-      final secured = await _secureStorage.read(key: _tokenKey);
+      final secured = await _secureStorage.read(key: _accessTokenKey);
       if (secured != null && secured.isNotEmpty) {
         return secured;
       }
@@ -36,22 +37,48 @@ class TokenStorageService {
       // ignore and fall back
     }
     final prefs = await _prefs;
-    final token = prefs.getString(_tokenKey);
+    final token = prefs.getString(_accessTokenKey);
     return (token == null || token.isEmpty) ? null : token;
   }
 
   Future<void> clearToken() async {
     try {
-      await _secureStorage.delete(key: _tokenKey);
+      await _secureStorage.delete(key: _accessTokenKey);
+      await _secureStorage.delete(key: _refreshTokenKey);
     } catch (_) {
       // ignore
     }
     final prefs = await _prefs;
-    await prefs.remove(_tokenKey);
+    await prefs.remove(_accessTokenKey);
+    await prefs.remove(_refreshTokenKey);
   }
 
   Future<bool> hasToken() async {
     final token = await getToken();
     return token != null && token.isNotEmpty;
   }
+
+  Future<void> setRefreshToken(String token) async {
+    try {
+      await _secureStorage.write(key: _refreshTokenKey, value: token);
+    } catch (_) {
+      // ignore secure storage failures in debug/unsupported environments
+    }
+    final prefs = await _prefs;
+    await prefs.setString(_refreshTokenKey, token);
+  }
+
+  Future<String?> getRefreshToken() async {
+    try {
+      final secured = await _secureStorage.read(key: _refreshTokenKey);
+      if (secured != null && secured.isNotEmpty) {
+        return secured;
+      }
+    } catch (_) {
+      // ignore and fall back
+    }
+    final prefs = await _prefs;
+    final token = prefs.getString(_refreshTokenKey);
+    return (token == null || token.isEmpty) ? null : token;
+  }
 }

lib/ui/app_shell.dart

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

lib/utils/download_helper.dart

@@ -0,0 +1,29 @@
+import 'dart:typed_data';
+
+import 'package:file_selector/file_selector.dart';
+
+class SaveResult {
+  final String? path;
+  final bool canceled;
+
+  const SaveResult({this.path, required this.canceled});
+}
+
+Future<SaveResult> saveBytes(
+  Uint8List bytes,
+  String filename, {
+  String? mimeType,
+}) async {
+  final safeName = filename.trim().isEmpty ? 'export.bin' : filename.trim();
+  final location = await getSaveLocation(suggestedName: safeName);
+  if (location == null) {
+    return const SaveResult(canceled: true);
+  }
+  final file = XFile.fromData(
+    bytes,
+    mimeType: mimeType ?? 'application/octet-stream',
+    name: safeName,
+  );
+  await file.saveTo(location.path);
+  return SaveResult(path: location.path, canceled: false);
+}

linux/CMakeLists.txt

@@ -4,10 +4,10 @@ project(runner LANGUAGES CXX)
 
 # The name of the executable created for the application. Change this to change
 # the on-disk name of your application.
-set(BINARY_NAME "mileograph_flutter")
+set(BINARY_NAME "Mileograph")
 # The unique GTK application identifier for this application. See:
 # https://wiki.gnome.org/HowDoI/ChooseApplicationID
-set(APPLICATION_ID "com.example.mileograph_flutter")
+set(APPLICATION_ID "com.petegregoryy.mileograph_flutter")
 
 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
 # versions of CMake.

linux/flutter/generated_plugin_registrant.cc

@@ -7,12 +7,16 @@
 #include "generated_plugin_registrant.h"
 
 #include <dynamic_color/dynamic_color_plugin.h>
+#include <file_selector_linux/file_selector_plugin.h>
 #include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) dynamic_color_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin");
   dynamic_color_plugin_register_with_registrar(dynamic_color_registrar);
+  g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
+  file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
   g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin");
   flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar);

linux/flutter/generated_plugins.cmake

@@ -4,6 +4,7 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   dynamic_color
+  file_selector_linux
   flutter_secure_storage_linux
 )
 

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -6,12 +6,14 @@ import FlutterMacOS
 import Foundation
 
 import dynamic_color
+import file_selector_macos
 import flutter_secure_storage_darwin
 import path_provider_foundation
 import shared_preferences_foundation
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
+  FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
   FlutterSecureStorageDarwinPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageDarwinPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))

pubspec.lock

@@ -73,6 +73,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.19.1"
+  cross_file:
+    dependency: transitive
+    description:
+      name: cross_file
+      sha256: "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.5+1"
   crypto:
     dependency: transitive
     description:
@@ -121,6 +129,70 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.1"
+  file_selector:
+    dependency: "direct main"
+    description:
+      name: file_selector
+      sha256: "5f1d15a7f17115038f433d1b0ea57513cc9e29a9d5338d166cb0bef3fa90a7a0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
+  file_selector_android:
+    dependency: transitive
+    description:
+      name: file_selector_android
+      sha256: "1ce58b609289551f8ec07265476720e77d19764339cc1d8e4df3c4d34dac6499"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.1+17"
+  file_selector_ios:
+    dependency: transitive
+    description:
+      name: file_selector_ios
+      sha256: fe9f52123af16bba4ad65bd7e03defbbb4b172a38a8e6aaa2a869a0c56a5f5fb
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.3+2"
+  file_selector_linux:
+    dependency: "direct main"
+    description:
+      name: file_selector_linux
+      sha256: "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.4"
+  file_selector_macos:
+    dependency: "direct main"
+    description:
+      name: file_selector_macos
+      sha256: "19124ff4a3d8864fdc62072b6a2ef6c222d55a3404fe14893a3c02744907b60c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.4+4"
+  file_selector_platform_interface:
+    dependency: transitive
+    description:
+      name: file_selector_platform_interface
+      sha256: "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.7.0"
+  file_selector_web:
+    dependency: "direct main"
+    description:
+      name: file_selector_web
+      sha256: c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.4+2"
+  file_selector_windows:
+    dependency: "direct main"
+    description:
+      name: file_selector_windows
+      sha256: "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.3+5"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -190,6 +262,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.0"
+  flutter_svg:
+    dependency: "direct main"
+    description:
+      name: flutter_svg
+      sha256: "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.3"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -328,6 +408,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.1"
+  path_parsing:
+    dependency: transitive
+    description:
+      name: path_parsing
+      sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   path_provider:
     dependency: transitive
     description:
@@ -533,6 +621,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  vector_graphics:
+    dependency: transitive
+    description:
+      name: vector_graphics
+      sha256: a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.19"
+  vector_graphics_codec:
+    dependency: transitive
+    description:
+      name: vector_graphics_codec
+      sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.13"
+  vector_graphics_compiler:
+    dependency: transitive
+    description:
+      name: vector_graphics_compiler
+      sha256: d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.19"
   vector_math:
     dependency: transitive
     description:
@@ -591,4 +703,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.8.1 <4.0.0"
-  flutter: ">=3.29.0"
+  flutter: ">=3.32.0"

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.6.5+7
+version: 0.7.7+15
 
 environment:
   sdk: ^3.8.1
@@ -37,6 +37,12 @@ dependencies:
   dynamic_color: ^1.6.6
   flutter_secure_storage: ^10.0.0
   collection: ^1.18.0
+  file_selector: ^1.0.3
+  file_selector_linux: ^0.9.3
+  file_selector_macos: ^0.9.4
+  file_selector_windows: ^0.9.3
+  file_selector_web: ^0.9.4
+  flutter_svg: ^2.0.10
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
@@ -68,6 +74,8 @@ flutter:
     - family: Tomatoes
       fonts:
         - asset: lib/assets/fonts/Tomatoes-O8L8.ttf
+  assets:
+    - assets/logos/pg_logo_v2.svg
   # To add assets to your application, add an assets section, like this:
   # assets:
   #   - images/a_dot_burr.jpeg

test/helpers/fake_services.dart

@@ -0,0 +1,265 @@
+import 'package:flutter/foundation.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 'test_data.dart';
+
+class FakeApiService extends ApiService {
+  FakeApiService({String baseUrl = 'https://example.com'})
+      : super(baseUrl: baseUrl);
+
+  final Map<String, dynamic> getResponses = {};
+  final Map<String, dynamic> postResponses = {};
+
+  @override
+  Future<dynamic> get(String endpoint, {Map<String, String>? headers}) async {
+    return getResponses[endpoint];
+  }
+
+  @override
+  Future<dynamic> post(
+    String endpoint,
+    dynamic data, {
+    Map<String, String>? headers,
+  }) async {
+    return postResponses[endpoint] ?? {};
+  }
+}
+
+class FakeAuthService extends AuthService {
+  FakeAuthService({
+    required super.api,
+    this.userIdValue = 'user-123',
+    this.usernameValue = 'railfan',
+    this.fullNameValue = 'Alex Rider',
+    this.isElevatedValue = true,
+    this.isLoggedInValue = true,
+  });
+
+  final String? userIdValue;
+  final String? usernameValue;
+  final String? fullNameValue;
+  final bool isElevatedValue;
+  final bool isLoggedInValue;
+
+  @override
+  bool get isLoggedIn => isLoggedInValue;
+
+  @override
+  String? get userId => userIdValue;
+
+  @override
+  String? get username => usernameValue;
+
+  @override
+  String? get fullName => fullNameValue;
+
+  @override
+  bool get isElevated => isElevatedValue;
+}
+
+class FakeDataService extends DataService {
+  FakeDataService({ApiService? api})
+      : super(api: api ?? FakeApiService());
+
+  HomepageStats? homepageStatsValue;
+  bool isHomepageLoadingValue = false;
+  List<TripSummary> tripsValue = [];
+  List<Leg> onThisDayValue = [];
+  bool isOnThisDayLoadingValue = false;
+  List<ClassClearanceProgress> classClearanceProgressValue = [];
+  bool isClassClearanceProgressLoadingValue = false;
+  List<LocoSummary> tractionValue = [];
+  bool isTractionLoadingValue = false;
+  bool tractionHasMoreValue = false;
+  List<LocoChange> latestLocoChangesValue = [];
+  bool isLatestLocoChangesLoadingValue = false;
+  bool latestLocoChangesHasMoreValue = false;
+  List<Leg> legsValue = [];
+  bool isLegsLoadingValue = false;
+  bool legsHasMoreValue = false;
+  List<TripDetail> tripDetailsValue = [];
+  List<TripSummary> tripListValue = [];
+  bool isTripDetailsLoadingValue = false;
+  List<String> locoClassesValue = [];
+  List<EventField> eventFieldsValue = [];
+  bool isEventFieldsLoadingValue = false;
+  int pendingLocoCountValue = 0;
+  double currentYearMileageValue = 0;
+
+  @override
+  HomepageStats? get homepageStats => homepageStatsValue;
+
+  @override
+  bool get isHomepageLoading => isHomepageLoadingValue;
+
+  @override
+  List<TripSummary> get trips => tripsValue;
+
+  @override
+  List<Leg> get onThisDay => onThisDayValue;
+
+  @override
+  bool get isOnThisDayLoading => isOnThisDayLoadingValue;
+
+  @override
+  List<ClassClearanceProgress> get classClearanceProgress =>
+      classClearanceProgressValue;
+
+  @override
+  bool get isClassClearanceProgressLoading =>
+      isClassClearanceProgressLoadingValue;
+
+  @override
+  List<LocoSummary> get traction => tractionValue;
+
+  @override
+  bool get isTractionLoading => isTractionLoadingValue;
+
+  @override
+  bool get tractionHasMore => tractionHasMoreValue;
+
+  @override
+  List<LocoChange> get latestLocoChanges => latestLocoChangesValue;
+
+  @override
+  bool get isLatestLocoChangesLoading => isLatestLocoChangesLoadingValue;
+
+  @override
+  bool get latestLocoChangesHasMore => latestLocoChangesHasMoreValue;
+
+  @override
+  List<Leg> get legs => legsValue;
+
+  @override
+  bool get isLegsLoading => isLegsLoadingValue;
+
+  @override
+  bool get legsHasMore => legsHasMoreValue;
+
+  @override
+  List<TripDetail> get tripDetails => tripDetailsValue;
+
+  @override
+  List<TripSummary> get tripList => tripListValue;
+
+  @override
+  bool get isTripDetailsLoading => isTripDetailsLoadingValue;
+
+  @override
+  List<String> get locoClasses => locoClassesValue;
+
+  @override
+  List<EventField> get eventFields => eventFieldsValue;
+
+  @override
+  bool get isEventFieldsLoading => isEventFieldsLoadingValue;
+
+  @override
+  int get pendingLocoCount => pendingLocoCountValue;
+
+  @override
+  double getMileageForCurrentYear() => currentYearMileageValue;
+
+  @override
+  Future<void> fetchHomepageStats() async {}
+
+  @override
+  Future<void> fetchOnThisDay({DateTime? date}) async {}
+
+  @override
+  Future<void> fetchTripDetails() async {}
+
+  @override
+  Future<void> fetchHadTraction({int offset = 0, int limit = 100}) async {}
+
+  @override
+  Future<void> fetchLatestLocoChanges({
+    int limit = 100,
+    int offset = 0,
+    bool append = false,
+  }) async {}
+
+  @override
+  Future<void> fetchClassClearanceProgress({
+    int offset = 0,
+    int limit = 20,
+    bool append = false,
+    bool onlyIncomplete = false,
+  }) async {}
+
+  @override
+  Future<void> fetchLegs({
+    int offset = 0,
+    int limit = 100,
+    String sortBy = 'date',
+    int sortDirection = 0,
+    String? dateRangeStart,
+    String? dateRangeEnd,
+    bool append = false,
+    bool unallocatedOnly = false,
+  }) async {}
+
+  @override
+  Future<List<TripLocoStat>> fetchTripLocoStats(int tripId) async {
+    return const [];
+  }
+
+  @override
+  Future<void> fetchTraction({
+    bool hadOnly = false,
+    int offset = 0,
+    int limit = 100,
+    String? locoClass,
+    String? locoNumber,
+    bool mileageFirst = true,
+    bool append = false,
+    Map<String, dynamic>? filters,
+  }) async {}
+
+  @override
+  Future<List<String>> fetchClassList({bool force = false}) async {
+    return locoClassesValue;
+  }
+
+  @override
+  Future<void> fetchEventFields({bool force = false}) async {}
+
+  @override
+  Future<void> fetchPendingLocoCount() async {}
+
+  @override
+  Future<Map<String, dynamic>?> fetchClassStats(String locoClass) async {
+    return TestData.classStats;
+  }
+
+  @override
+  Future<List<LeaderboardEntry>> fetchClassLeaderboard(
+    String locoClass, {
+    bool friends = false,
+  }) async {
+    return TestData.classLeaderboard;
+  }
+}
+
+class FakeDistanceUnitService extends DistanceUnitService {
+  FakeDistanceUnitService({this.unitOverride});
+
+  final DistanceUnit? unitOverride;
+
+  @override
+  DistanceUnit get unit => unitOverride ?? super.unit;
+
+  @override
+  String format(
+    double miles, {
+    int decimals = 1,
+    bool includeUnit = true,
+  }) {
+    final formatter = DistanceFormatter(unitOverride ?? super.unit);
+    return formatter.format(miles, decimals: decimals, includeUnit: includeUnit);
+  }
+}

test/helpers/test_app.dart

@@ -0,0 +1,42 @@
+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';
+
+Widget buildTestApp({
+  required Widget child,
+  required DataService dataService,
+  required AuthService authService,
+  DistanceUnitService? distanceUnitService,
+}) {
+  return MultiProvider(
+    providers: [
+      ChangeNotifierProvider<AuthService>.value(value: authService),
+      ChangeNotifierProvider<DataService>.value(value: dataService),
+      ChangeNotifierProvider<DistanceUnitService>.value(
+        value: distanceUnitService ?? DistanceUnitService(),
+      ),
+    ],
+    child: MaterialApp(home: child),
+  );
+}
+
+Widget buildTestRouterApp({
+  required GoRouter router,
+  required DataService dataService,
+  required AuthService authService,
+  DistanceUnitService? distanceUnitService,
+}) {
+  return MultiProvider(
+    providers: [
+      ChangeNotifierProvider<AuthService>.value(value: authService),
+      ChangeNotifierProvider<DataService>.value(value: dataService),
+      ChangeNotifierProvider<DistanceUnitService>.value(
+        value: distanceUnitService ?? DistanceUnitService(),
+      ),
+    ],
+    child: MaterialApp.router(routerConfig: router),
+  );
+}

test/helpers/test_data.dart

@@ -0,0 +1,328 @@
+import 'package:mileograph_flutter/objects/objects.dart';
+
+class TestData {
+  static final user = UserData(
+    username: 'railfan',
+    fullName: 'Alex Rider',
+    userId: 'user-123',
+    email: 'alex@example.com',
+    entriesVisibility: 'public',
+    mileageVisibility: 'public',
+    elevated: true,
+    disabled: false,
+  );
+
+  static final topLocos = [
+    LocoSummary(
+      locoId: 100,
+      locoType: 'D',
+      locoNumber: '001',
+      locoName: 'Atlas',
+      locoClass: '67',
+      locoOperator: 'TestRail',
+      mileage: 1200.5,
+      journeys: 18,
+      trips: 6,
+      status: 'Active',
+      domain: 'mainline',
+      owner: 'TestRail',
+      livery: 'Blue',
+      location: 'Depot',
+    ),
+    LocoSummary(
+      locoId: 101,
+      locoType: 'D',
+      locoNumber: '002',
+      locoName: 'Orion',
+      locoClass: '68',
+      locoOperator: 'TestRail',
+      mileage: 980.2,
+      journeys: 12,
+      trips: 4,
+      status: 'Active',
+      domain: 'mainline',
+      owner: 'TestRail',
+      livery: 'Orange',
+      location: 'Central',
+    ),
+  ];
+
+  static final leaderboard = [
+    LeaderboardEntry(
+      userId: 'u1',
+      username: 'driver_one',
+      userFullName: 'Driver One',
+      mileage: 3456.7,
+    ),
+    LeaderboardEntry(
+      userId: 'u2',
+      username: 'driver_two',
+      userFullName: 'Driver Two',
+      mileage: 2999.1,
+    ),
+  ];
+
+  static final tripSummaries = [
+    TripSummary(
+      tripId: 1,
+      tripName: 'North Run',
+      tripMileage: 220.4,
+      legCount: 3,
+      locoStats: [
+        TripLocoStat(locoClass: '67', number: '001', won: true),
+        TripLocoStat(locoClass: '68', number: '002', won: false),
+      ],
+      startDate: DateTime(2023, 10, 11),
+      endDate: DateTime(2023, 10, 13),
+    ),
+    TripSummary(
+      tripId: 2,
+      tripName: 'Harbor Loop',
+      tripMileage: 85.6,
+      legCount: 1,
+      locoStats: const [],
+      startDate: DateTime(2023, 11, 5),
+      endDate: DateTime(2023, 11, 5),
+    ),
+  ];
+
+  static final tripDetails = [
+    TripDetail(
+      id: 1,
+      name: 'North Run',
+      mileage: 220.4,
+      legCount: 3,
+      locoStats: [
+        TripLocoStat(locoClass: '67', number: '001', won: true),
+      ],
+      legs: [
+        TripLeg(
+          id: 10,
+          start: 'London',
+          end: 'Leeds',
+          beginTime: DateTime(2023, 10, 11, 9, 15),
+          network: 'National',
+          route: 'London → Leeds',
+          mileage: 185.2,
+          notes: 'Clear run',
+          locos: [
+            Loco(
+              id: 100,
+              type: 'D',
+              number: '001',
+              name: 'Atlas',
+              locoClass: '67',
+              operator: 'TestRail',
+              notes: '',
+              evn: '',
+            ),
+          ],
+        ),
+      ],
+    ),
+  ];
+
+  static final legs = [
+    Leg(
+      id: 501,
+      tripId: 1,
+      start: 'London',
+      end: 'Oxford',
+      beginTime: DateTime(2023, 9, 12, 7, 45),
+      timezone: 0,
+      network: 'National',
+      route: ['London', 'Oxford'],
+      mileage: 62.3,
+      notes: 'Morning service',
+      headcode: '1A00',
+      driving: 0,
+      user: 'railfan',
+      locos: [
+        Loco(
+          id: 100,
+          type: 'D',
+          number: '001',
+          name: 'Atlas',
+          locoClass: '67',
+          operator: 'TestRail',
+          notes: '',
+          evn: '',
+        ),
+      ],
+    ),
+    Leg(
+      id: 502,
+      tripId: 2,
+      start: 'Oxford',
+      end: 'Bristol',
+      beginTime: DateTime(2023, 9, 13, 16, 10),
+      timezone: 0,
+      network: 'National',
+      route: ['Oxford', 'Bristol'],
+      mileage: 74.8,
+      notes: 'Evening run',
+      headcode: '1B10',
+      driving: 0,
+      user: 'railfan',
+      locos: [
+        Loco(
+          id: 101,
+          type: 'D',
+          number: '002',
+          name: 'Orion',
+          locoClass: '68',
+          operator: 'TestRail',
+          notes: '',
+          evn: '',
+        ),
+      ],
+    ),
+  ];
+
+  static List<Leg> onThisDayLegs() {
+    final pastYear = DateTime.now().year - 1;
+    return [
+      Leg(
+        id: 900,
+        tripId: 3,
+        start: 'York',
+        end: 'Durham',
+        beginTime: DateTime(pastYear, 7, 4, 10, 30),
+        timezone: 0,
+        network: 'National',
+        route: ['York', 'Durham'],
+        mileage: 60.0,
+        notes: 'Anniversary run',
+        headcode: '1C11',
+        driving: 0,
+        user: 'railfan',
+        locos: [
+          Loco(
+            id: 102,
+            type: 'D',
+            number: '003',
+            name: 'Nova',
+            locoClass: '66',
+            operator: 'TestRail',
+            notes: '',
+            evn: '',
+          ),
+        ],
+      ),
+    ];
+  }
+
+  static final latestLocoChanges = [
+    LocoChange(
+      locoId: 200,
+      locoClass: '67',
+      locoNumber: '001',
+      locoName: 'Atlas',
+      attrCode: 'loco_status',
+      attrDisplay: 'Status',
+      valueDisplay: 'Active',
+      validFrom: DateTime(2023, 10, 1),
+      approvedAt: DateTime(2023, 10, 2),
+      approvedBy: 'moderator',
+    ),
+  ];
+
+  static final classClearance = [
+    ClassClearanceProgress(
+      className: 'Class 67',
+      completed: 12,
+      total: 30,
+      percentComplete: 40.0,
+      activeCompleted: 8,
+      activeTotal: 20,
+      activePercent: 40.0,
+    ),
+  ];
+
+  static final traction = [
+    LocoSummary(
+      locoId: 100,
+      locoType: 'D',
+      locoNumber: '001',
+      locoName: 'Atlas',
+      locoClass: '67',
+      locoOperator: 'TestRail',
+      mileage: 1200.5,
+      journeys: 18,
+      trips: 6,
+      status: 'Active',
+      domain: 'mainline',
+      owner: 'TestRail',
+      livery: 'Blue',
+      location: 'Depot',
+    ),
+    LocoSummary(
+      locoId: 101,
+      locoType: 'D',
+      locoNumber: '002',
+      locoName: 'Orion',
+      locoClass: '68',
+      locoOperator: 'TestRail',
+      mileage: 980.2,
+      journeys: 12,
+      trips: 4,
+      status: 'Active',
+      domain: 'mainline',
+      owner: 'TestRail',
+      livery: 'Orange',
+      location: 'Central',
+    ),
+  ];
+
+  static final eventFields = [
+    const EventField(name: 'power_unit', display: 'Power Unit', type: 'text'),
+    const EventField(
+      name: 'cab_air_conditioning',
+      display: 'Cab A/C',
+      enumValues: ['Yes', 'No'],
+    ),
+  ];
+
+  static final classStats = <String, dynamic>{
+    'loco_class': '67',
+    'total_mileage_with_class': 5500.5,
+    'avg_mileage_per_entry': 80.2,
+    'avg_mileage_per_loco_had': 420.0,
+    'had_count': 12,
+    'entries_with_class': 42,
+    'class_stats': {
+      'total': 30,
+      'status': [
+        {'status': 'Active', 'count': 18},
+        {'status': 'Stored', 'count': 12},
+      ],
+      'domain': [
+        {'domain': 'mainline', 'count': 20},
+        {'domain': 'heritage', 'count': 10},
+      ],
+    },
+  };
+
+  static final classLeaderboard = [
+    LeaderboardEntry(
+      userId: 'u3',
+      username: 'fan_three',
+      userFullName: 'Fan Three',
+      mileage: 1500.0,
+    ),
+  ];
+
+  static final homepageStats = HomepageStats(
+    totalMileage: 4523.8,
+    yearlyMileage: [
+      YearlyMileage(year: DateTime.now().year, mileage: 1200.5),
+      YearlyMileage(year: DateTime.now().year - 1, mileage: 990.2),
+    ],
+    topLocos: topLocos,
+    leaderboard: leaderboard,
+    friendsLeaderboard: leaderboard,
+    trips: tripSummaries,
+    legCount: 27,
+    user: user,
+  );
+}

test/pages/dashboard_page_test.dart

@@ -0,0 +1,84 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:go_router/go_router.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import 'package:mileograph_flutter/components/pages/dashboard.dart';
+
+import '../helpers/fake_services.dart';
+import '../helpers/test_app.dart';
+import '../helpers/test_data.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  setUpAll(() {
+    SharedPreferences.setMockInitialValues({});
+  });
+
+  testWidgets('Dashboard renders stats and panels', (tester) async {
+    final data = FakeDataService()
+      ..homepageStatsValue = TestData.homepageStats
+      ..tripsValue = TestData.tripSummaries
+      ..onThisDayValue = TestData.onThisDayLegs()
+      ..classClearanceProgressValue = TestData.classClearance
+      ..latestLocoChangesValue = TestData.latestLocoChanges
+      ..tractionValue = TestData.traction
+      ..currentYearMileageValue = 1200.5;
+    final auth = FakeAuthService(api: FakeApiService());
+    final router = GoRouter(
+      routes: [
+        GoRoute(
+          path: '/',
+          builder: (context, state) => const Dashboard(),
+        ),
+      ],
+    );
+
+    await tester.pumpWidget(
+      buildTestRouterApp(
+        router: router,
+        dataService: data,
+        authService: auth,
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.text('Dashboard'), findsOneWidget);
+    expect(find.textContaining('Welcome back, Alex Rider'), findsOneWidget);
+    expect(find.text('Top traction'), findsOneWidget);
+    expect(find.text('67 001'), findsOneWidget);
+    expect(find.text('On this day'), findsOneWidget);
+    expect(find.text('York → Durham'), findsOneWidget);
+    expect(find.text('Latest Loco Changes'), findsOneWidget);
+    expect(find.text('Status'), findsWidgets);
+    expect(find.text('Active'), findsWidgets);
+  });
+
+  testWidgets('Dashboard shows loading overlay without stats', (tester) async {
+    final data = FakeDataService()
+      ..homepageStatsValue = null
+      ..isHomepageLoadingValue = true;
+    final auth = FakeAuthService(api: FakeApiService());
+    final router = GoRouter(
+      routes: [
+        GoRoute(
+          path: '/',
+          builder: (context, state) => const Dashboard(),
+        ),
+      ],
+    );
+
+    await tester.pumpWidget(
+      buildTestRouterApp(
+        router: router,
+        dataService: data,
+        authService: auth,
+      ),
+    );
+    await tester.pump();
+
+    expect(find.text('Loading dashboard data...'), findsOneWidget);
+    expect(find.byType(CircularProgressIndicator), findsWidgets);
+  });
+}

test/pages/entries_page_test.dart

@@ -0,0 +1,60 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import 'package:mileograph_flutter/components/pages/legs.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
+
+import '../helpers/fake_services.dart';
+import '../helpers/test_app.dart';
+import '../helpers/test_data.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  setUpAll(() {
+    SharedPreferences.setMockInitialValues({});
+  });
+
+  testWidgets('Entries page shows legs and mileage summary', (tester) async {
+    final data = FakeDataService()..legsValue = TestData.legs;
+    final auth = FakeAuthService(api: FakeApiService());
+    final distanceUnits = FakeDistanceUnitService(
+      unitOverride: DistanceUnit.milesDecimal,
+    );
+
+    await tester.pumpWidget(
+      buildTestApp(
+        child: const LegsPage(),
+        dataService: data,
+        authService: auth,
+        distanceUnitService: distanceUnits,
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.text('Entries'), findsOneWidget);
+    expect(find.text('Page mileage'), findsOneWidget);
+    expect(find.textContaining('mi'), findsWidgets);
+    expect(find.text('London'), findsOneWidget);
+    expect(find.text('Oxford'), findsOneWidget);
+  });
+
+  testWidgets('Entries page shows empty state', (tester) async {
+    final data = FakeDataService()
+      ..legsValue = []
+      ..isLegsLoadingValue = false;
+    final auth = FakeAuthService(api: FakeApiService());
+
+    await tester.pumpWidget(
+      buildTestApp(
+        child: const LegsPage(),
+        dataService: data,
+        authService: auth,
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.text('No entries found'), findsOneWidget);
+    expect(find.text('Adjust the filters or add a new leg.'), findsOneWidget);
+  });
+}

test/pages/traction_page_test.dart

@@ -0,0 +1,114 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:go_router/go_router.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import 'package:mileograph_flutter/components/pages/traction.dart';
+
+import '../helpers/fake_services.dart';
+import '../helpers/test_app.dart';
+import '../helpers/test_data.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  setUpAll(() {
+    SharedPreferences.setMockInitialValues({});
+  });
+
+  testWidgets('Traction page shows list data', (tester) async {
+    final data = FakeDataService()
+      ..tractionValue = TestData.traction
+      ..locoClassesValue = ['67', '68']
+      ..eventFieldsValue = TestData.eventFields;
+    final auth = FakeAuthService(api: FakeApiService(), isElevatedValue: true);
+    final router = GoRouter(
+      routes: [
+        GoRoute(
+          path: '/',
+          builder: (context, state) => const TractionPage(),
+        ),
+      ],
+    );
+
+    await tester.pumpWidget(
+      buildTestRouterApp(
+        router: router,
+        dataService: data,
+        authService: auth,
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.text('Traction'), findsOneWidget);
+    expect(find.text('67'), findsWidgets);
+    expect(find.text('001'), findsWidgets);
+  });
+
+  testWidgets('Traction page shows export when class filter set', (tester) async {
+    final data = FakeDataService()
+      ..tractionValue = TestData.traction
+      ..locoClassesValue = ['67', '68']
+      ..eventFieldsValue = TestData.eventFields;
+    final auth = FakeAuthService(api: FakeApiService(), isElevatedValue: true);
+    final router = GoRouter(
+      routes: [
+        GoRoute(
+          path: '/',
+          builder: (context, state) => const TractionPage(),
+        ),
+      ],
+    );
+
+    await tester.pumpWidget(
+      buildTestRouterApp(
+        router: router,
+        dataService: data,
+        authService: auth,
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.textContaining('Export'), findsNothing);
+
+    final classField = find.byWidgetPredicate(
+      (widget) =>
+          widget is TextField && widget.decoration?.labelText == 'Class',
+    );
+    await tester.enterText(classField, '67');
+    await tester.pump();
+
+    expect(find.text('Export 67'), findsOneWidget);
+  });
+
+  testWidgets('Traction page shows admin import option', (tester) async {
+    final data = FakeDataService()
+      ..tractionValue = TestData.traction
+      ..locoClassesValue = ['67', '68']
+      ..eventFieldsValue = TestData.eventFields
+      ..pendingLocoCountValue = 2;
+    final auth = FakeAuthService(api: FakeApiService(), isElevatedValue: true);
+    final router = GoRouter(
+      routes: [
+        GoRoute(
+          path: '/',
+          builder: (context, state) => const TractionPage(),
+        ),
+      ],
+    );
+
+    await tester.pumpWidget(
+      buildTestRouterApp(
+        router: router,
+        dataService: data,
+        authService: auth,
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byType(PopupMenuButton));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Import traction'), findsOneWidget);
+  });
+}

test/pages/trips_page_test.dart

@@ -0,0 +1,64 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import 'package:mileograph_flutter/components/pages/trips.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
+
+import '../helpers/fake_services.dart';
+import '../helpers/test_app.dart';
+import '../helpers/test_data.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  setUpAll(() {
+    SharedPreferences.setMockInitialValues({});
+  });
+
+  testWidgets('Trips page shows trip details', (tester) async {
+    final data = FakeDataService()
+      ..tripDetailsValue = TestData.tripDetails
+      ..tripListValue = TestData.tripSummaries;
+    final auth = FakeAuthService(api: FakeApiService());
+    final distanceUnits = FakeDistanceUnitService(
+      unitOverride: DistanceUnit.milesDecimal,
+    );
+
+    await tester.pumpWidget(
+      buildTestApp(
+        child: const TripsPage(),
+        dataService: data,
+        authService: auth,
+        distanceUnitService: distanceUnits,
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.text('Trips'), findsOneWidget);
+    expect(find.text('North Run'), findsOneWidget);
+    expect(find.textContaining('mi'), findsWidgets);
+  });
+
+  testWidgets('Trips page shows empty state', (tester) async {
+    final data = FakeDataService()
+      ..tripDetailsValue = []
+      ..tripListValue = []
+      ..isTripDetailsLoadingValue = false;
+    final auth = FakeAuthService(api: FakeApiService());
+
+    await tester.pumpWidget(
+      buildTestApp(
+        child: const TripsPage(),
+        dataService: data,
+        authService: auth,
+      ),
+    );
+    await tester.pumpAndSettle();
+
+    expect(find.text('No trips yet'), findsOneWidget);
+    expect(
+      find.text('Use the Add entry flow to start grouping legs into trips.'),
+      findsOneWidget,
+    );
+  });
+}

windows/flutter/generated_plugin_registrant.cc

@@ -7,11 +7,14 @@
 #include "generated_plugin_registrant.h"
 
 #include <dynamic_color/dynamic_color_plugin_c_api.h>
+#include <file_selector_windows/file_selector_windows.h>
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
   DynamicColorPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
+  FileSelectorWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FileSelectorWindows"));
   FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
 }

windows/flutter/generated_plugins.cmake

@@ -4,6 +4,7 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   dynamic_color
+  file_selector_windows
   flutter_secure_storage_windows
 )