fix: show full discrepancy details in account list (#296)

The sync health row displayed "Discrepancies found" but never showed
what the discrepancies were. Parse the stored JSON summary to show
totals (missing locally, missing on server, flag mismatches). Also
wrap the status text in Flexible so long messages are not clipped.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.forgejo/workflows/website.yml

@@ -1,4 +1,4 @@
-name: Update Website
+name: Deploy Website
 
 on:
   push:
@@ -11,7 +11,7 @@ on:
 
 jobs:
   deploy:
-    name: Build & Update Website
+    name: Build & Deploy Website
     runs-on: ubuntu-latest
     timeout-minutes: 60
 
@@ -34,7 +34,7 @@ jobs:
           DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
         run: scripts/setup_dagger_remote.sh
 
-      - name: Build & Update Website
+      - name: Build & Deploy Website
         if: ${{ secrets.SSH_PRIVATE_KEY != '' }}
         env:
           SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
@@ -45,7 +45,6 @@ jobs:
         run: task publish-website
 
       - name: Verify Website
-        if: ${{ secrets.SSH_PRIVATE_KEY != '' }}
         env:
           SSH_HOST: ${{ secrets.WEBSITE_SSH_HOST }}
         run: scripts/website-verify.sh

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.44.0"
+  "flutter": "3.41.6"
 }

android/app/build.gradle.kts

@@ -67,7 +67,7 @@ flutter {
 
 dependencies {
     // Required for flutter_local_notifications and other plugins that need Java 8+ APIs on API < 26.
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
     // integration_test is a dev dependency; the Flutter plugin loader adds it as
     // debugImplementation only, but GeneratedPluginRegistrant.java (in src/main)
     // references its class in all variants. Make it available for release compilation

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip

ci/go.mod

@@ -44,10 +44,10 @@ require (
 	google.golang.org/protobuf v1.36.11 // indirect
 )
 
-replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.19.0
+replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.16.0
 
-replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.19.0
+replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.16.0
 
-replace go.opentelemetry.io/otel/log => go.opentelemetry.io/otel/log v0.19.0
+replace go.opentelemetry.io/otel/log => go.opentelemetry.io/otel/log v0.16.0
 
-replace go.opentelemetry.io/otel/sdk/log => go.opentelemetry.io/otel/sdk/log v0.19.0
+replace go.opentelemetry.io/otel/sdk/log => go.opentelemetry.io/otel/sdk/log v0.16.0

integration_test/app_e2e_test.dart

@@ -317,7 +317,7 @@ void main() {
 
       // ── Check Sent folder ──────────────────────────────────────────────────
       // Use the drawer to switch folders (no back button on Linux desktop).
-      await tester.tap(find.byTooltip('Open folders'));
+      await tester.tap(find.byTooltip('Open navigation menu'));
       await tester.pumpAndSettle();
       await tester.tap(find.text('Sent'));
       await tester.pumpAndSettle();
@@ -331,7 +331,7 @@ void main() {
       expect(find.text(subject), findsOneWidget);
 
       // ── Check Inbox ────────────────────────────────────────────────────────
-      await tester.tap(find.byTooltip('Open folders'));
+      await tester.tap(find.byTooltip('Open navigation menu'));
       await tester.pumpAndSettle();
       await tester.tap(find.text('INBOX'));
       await tester.pumpAndSettle();

lib/core/db_schema_version.dart

@@ -1 +1 @@
-const int dbSchemaVersion = 36;
+const int dbSchemaVersion = 33;

lib/core/models/user_preferences.dart

@@ -1,14 +0,0 @@
-enum MenuPosition { bottom, top }
-
-enum AfterMailViewAction { nextMessage, showMailbox }
-
-class UserPreferences {
-  const UserPreferences({
-    this.menuPosition = MenuPosition.bottom,
-    this.mailViewButtonPosition = MenuPosition.bottom,
-    this.afterMailViewAction = AfterMailViewAction.nextMessage,
-  });
-  final MenuPosition menuPosition;
-  final MenuPosition mailViewButtonPosition;
-  final AfterMailViewAction afterMailViewAction;
-}

lib/core/repositories/user_preferences_repository.dart

@@ -1,8 +0,0 @@
-import 'package:sharedinbox/core/models/user_preferences.dart';
-
-abstract class UserPreferencesRepository {
-  Stream<UserPreferences> observePreferences();
-  Future<void> updateMenuPosition(MenuPosition position);
-  Future<void> updateMailViewButtonPosition(MenuPosition position);
-  Future<void> updateAfterMailViewAction(AfterMailViewAction action);
-}

lib/data/db/database.dart

@@ -307,23 +307,6 @@ class LocalSieveApplied extends Table {
   Set<Column> get primaryKey => {accountId, messageId};
 }
 
-/// App-wide user preferences, stored as a singleton row (id always 1).
-@DataClassName('UserPreferencesRow')
-class UserPreferences extends Table {
-  IntColumn get id => integer()();
-  // 'bottom' (default) | 'top'
-  TextColumn get menuPosition => text().withDefault(const Constant('bottom'))();
-  // Added in schema v35: 'bottom' (default) | 'top'
-  TextColumn get mailViewButtonPosition =>
-      text().withDefault(const Constant('bottom'))();
-  // Added in schema v36: 'nextMessage' (default) | 'showMailbox'
-  TextColumn get afterMailViewAction =>
-      text().withDefault(const Constant('nextMessage'))();
-
-  @override
-  Set<Column> get primaryKey => {id};
-}
-
 // ── Database ──────────────────────────────────────────────────────────────────
 
 @DriftDatabase(
@@ -344,7 +327,6 @@ class UserPreferences extends Table {
     LocalSieveScripts,
     LocalSieveApplied,
     ShareKeys,
-    UserPreferences,
   ],
 )
 class AppDatabase extends _$AppDatabase {
@@ -596,21 +578,6 @@ class AppDatabase extends _$AppDatabase {
             await m.addColumn(syncLogs, syncLogs.errorStackTrace);
             await m.addColumn(syncLogs, syncLogs.isPermanent);
           }
-          if (from < 34) {
-            await m.createTable(userPreferences);
-          }
-          if (from >= 34 && from < 35) {
-            await m.addColumn(
-              userPreferences,
-              userPreferences.mailViewButtonPosition,
-            );
-          }
-          if (from >= 34 && from < 36) {
-            await m.addColumn(
-              userPreferences,
-              userPreferences.afterMailViewAction,
-            );
-          }
         },
       );
 }

lib/data/repositories/user_preferences_repository_impl.dart

@@ -1,68 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart' as pref;
-import 'package:sharedinbox/core/repositories/user_preferences_repository.dart';
-import 'package:sharedinbox/data/db/database.dart';
-
-class UserPreferencesRepositoryImpl implements UserPreferencesRepository {
-  UserPreferencesRepositoryImpl(this._db);
-
-  final AppDatabase _db;
-  static const _rowId = 1;
-
-  @override
-  Stream<pref.UserPreferences> observePreferences() {
-    return (_db.select(_db.userPreferences)..where((t) => t.id.equals(_rowId)))
-        .watchSingleOrNull()
-        .map(_rowToModel);
-  }
-
-  @override
-  Future<void> updateMenuPosition(pref.MenuPosition position) async {
-    await _db.into(_db.userPreferences).insertOnConflictUpdate(
-          UserPreferencesCompanion(
-            id: const Value(_rowId),
-            menuPosition: Value(position.name),
-          ),
-        );
-  }
-
-  @override
-  Future<void> updateMailViewButtonPosition(pref.MenuPosition position) async {
-    await _db.into(_db.userPreferences).insertOnConflictUpdate(
-          UserPreferencesCompanion(
-            id: const Value(_rowId),
-            mailViewButtonPosition: Value(position.name),
-          ),
-        );
-  }
-
-  @override
-  Future<void> updateAfterMailViewAction(
-    pref.AfterMailViewAction action,
-  ) async {
-    await _db.into(_db.userPreferences).insertOnConflictUpdate(
-          UserPreferencesCompanion(
-            id: const Value(_rowId),
-            afterMailViewAction: Value(action.name),
-          ),
-        );
-  }
-
-  static pref.UserPreferences _rowToModel(UserPreferencesRow? row) {
-    if (row == null) return const pref.UserPreferences();
-    return pref.UserPreferences(
-      menuPosition: pref.MenuPosition.values.firstWhere(
-        (e) => e.name == row.menuPosition,
-        orElse: () => pref.MenuPosition.bottom,
-      ),
-      mailViewButtonPosition: pref.MenuPosition.values.firstWhere(
-        (e) => e.name == row.mailViewButtonPosition,
-        orElse: () => pref.MenuPosition.bottom,
-      ),
-      afterMailViewAction: pref.AfterMailViewAction.values.firstWhere(
-        (e) => e.name == row.afterMailViewAction,
-        orElse: () => pref.AfterMailViewAction.nextMessage,
-      ),
-    );
-  }
-}

lib/di.dart

@@ -5,7 +5,6 @@ import 'package:http/http.dart' as http;
 import 'package:sharedinbox/core/models/account.dart' as model;
 import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/undo_action.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart';
 import 'package:sharedinbox/core/repositories/account_repository.dart';
 import 'package:sharedinbox/core/repositories/draft_repository.dart';
 import 'package:sharedinbox/core/repositories/email_repository.dart';
@@ -14,7 +13,6 @@ import 'package:sharedinbox/core/repositories/search_history_repository.dart';
 import 'package:sharedinbox/core/repositories/share_key_repository.dart';
 import 'package:sharedinbox/core/repositories/sync_log_repository.dart';
 import 'package:sharedinbox/core/repositories/undo_repository.dart';
-import 'package:sharedinbox/core/repositories/user_preferences_repository.dart';
 import 'package:sharedinbox/core/services/account_discovery_service.dart';
 import 'package:sharedinbox/core/services/connection_test_service.dart';
 import 'package:sharedinbox/core/services/managesieve_probe_service.dart';
@@ -23,8 +21,7 @@ import 'package:sharedinbox/core/services/undo_service.dart';
 import 'package:sharedinbox/core/storage/secure_storage.dart';
 import 'package:sharedinbox/core/sync/account_sync_manager.dart';
 import 'package:sharedinbox/core/sync/reliability_runner.dart';
-import 'package:sharedinbox/data/db/database.dart'
-    hide Email, EmailBody, UserPreferences;
+import 'package:sharedinbox/data/db/database.dart' hide Email, EmailBody;
 import 'package:sharedinbox/data/db/local_sieve_repository.dart';
 import 'package:sharedinbox/data/imap/imap_client_factory.dart';
 import 'package:sharedinbox/data/jmap/sieve_repository.dart';
@@ -36,7 +33,6 @@ import 'package:sharedinbox/data/repositories/search_history_repository_impl.dar
 import 'package:sharedinbox/data/repositories/share_key_repository_impl.dart';
 import 'package:sharedinbox/data/repositories/sync_log_repository_impl.dart';
 import 'package:sharedinbox/data/repositories/undo_repository_impl.dart';
-import 'package:sharedinbox/data/repositories/user_preferences_repository_impl.dart';
 import 'package:sharedinbox/data/storage/flutter_secure_storage_impl.dart';
 
 /// Swappable IMAP connection factory — override in tests to use plaintext.
@@ -231,13 +227,3 @@ final accountConnectionStatusProvider =
       .read(connectionTestServiceProvider)
       .testConnection(account, password);
 });
-
-final userPreferencesRepositoryProvider =
-    Provider<UserPreferencesRepository>((ref) {
-  return UserPreferencesRepositoryImpl(ref.watch(dbProvider));
-});
-
-final userPreferencesProvider =
-    StreamProvider.autoDispose<UserPreferences>((ref) {
-  return ref.watch(userPreferencesRepositoryProvider).observePreferences();
-});

lib/ui/router.dart

@@ -20,7 +20,6 @@ import 'package:sharedinbox/ui/screens/sieve_scripts_screen.dart';
 import 'package:sharedinbox/ui/screens/sync_log_screen.dart';
 import 'package:sharedinbox/ui/screens/thread_detail_screen.dart';
 import 'package:sharedinbox/ui/screens/undo_log_screen.dart';
-import 'package:sharedinbox/ui/screens/user_preferences_screen.dart';
 import 'package:sharedinbox/ui/widgets/undo_shell.dart';
 
 final router = GoRouter(
@@ -57,10 +56,6 @@ final router = GoRouter(
               path: 'about',
               builder: (ctx, state) => const AboutScreen(),
             ),
-            GoRoute(
-              path: 'preferences',
-              builder: (ctx, state) => const UserPreferencesScreen(),
-            ),
             GoRoute(
               path: ':accountId/edit',
               builder: (ctx, state) => EditAccountScreen(

lib/ui/screens/account_list_screen.dart

@@ -67,14 +67,6 @@ class AccountListScreen extends ConsumerWidget {
                 unawaited(context.push('/accounts/about'));
               },
             ),
-            ListTile(
-              leading: const Icon(Icons.settings),
-              title: const Text('Preferences'),
-              onTap: () {
-                Navigator.pop(context); // Close drawer
-                unawaited(context.push('/accounts/preferences'));
-              },
-            ),
           ],
         ),
       ),

lib/ui/screens/email_detail_screen.dart

@@ -13,7 +13,6 @@ import 'package:share_plus/share_plus.dart';
 
 import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/undo_action.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart';
 import 'package:sharedinbox/core/utils/format_utils.dart';
 import 'package:sharedinbox/core/utils/html_utils.dart';
 import 'package:sharedinbox/di.dart';
@@ -99,7 +98,6 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
             icon: const Icon(Icons.delete),
             tooltip: 'Delete',
             onPressed: () async {
-              final nextEmailId = await _getNextEmailIdIfNeeded(header);
               final destPath = await repo.deleteEmail(widget.emailId);
 
               if (header != null) {
@@ -118,7 +116,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
                 );
               }
 
-              if (context.mounted) _navigateTo(context, header, nextEmailId);
+              if (context.mounted) context.pop();
             },
           ),
           IconButton(
@@ -173,9 +171,8 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
             ],
             onSelected: (value) async {
               if (value == 'mark_unread') {
-                final nextEmailId = await _getNextEmailIdIfNeeded(header);
                 await repo.setFlag(widget.emailId, seen: false);
-                if (context.mounted) _navigateTo(context, header, nextEmailId);
+                if (context.mounted) context.pop();
               } else if (value == 'headers' && body != null) {
                 _showHeaders(context, body);
               } else if (value == 'structure' && body != null) {
@@ -255,39 +252,6 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
     );
   }
 
-  Future<String?> _getNextEmailIdIfNeeded(Email? header) async {
-    if (header == null) return null;
-    final prefs = ref.read(userPreferencesProvider).value;
-    final action =
-        prefs?.afterMailViewAction ?? AfterMailViewAction.nextMessage;
-    if (action != AfterMailViewAction.nextMessage) return null;
-
-    final threads = await ref
-        .read(emailRepositoryProvider)
-        .observeThreads(header.accountId, header.mailboxPath)
-        .first;
-
-    final currentIndex =
-        threads.indexWhere((t) => t.emailIds.contains(widget.emailId));
-    if (currentIndex >= 0 && currentIndex + 1 < threads.length) {
-      return threads[currentIndex + 1].latestEmailId;
-    }
-    return null;
-  }
-
-  void _navigateTo(BuildContext context, Email? header, String? nextEmailId) {
-    if (!context.mounted) return;
-    if (nextEmailId != null && header != null) {
-      context.go(
-        '/accounts/${header.accountId}'
-        '/mailboxes/${Uri.encodeComponent(header.mailboxPath)}'
-        '/emails/${Uri.encodeComponent(nextEmailId)}',
-      );
-    } else {
-      context.pop();
-    }
-  }
-
   Future<void> _downloadAndOpen(EmailAttachment att) async {
     setState(() => _downloading.add(att.filename));
     try {
@@ -439,9 +403,6 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
   }
 
   Future<void> _archive(BuildContext context, Email header) async {
-    final nextEmailId = await _getNextEmailIdIfNeeded(header);
-    if (!context.mounted) return;
-
     final mailbox = await resolveMailboxByRole(
       context,
       ref.read(mailboxRepositoryProvider),
@@ -471,13 +432,10 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           ),
     );
 
-    if (context.mounted) _navigateTo(context, header, nextEmailId);
+    if (context.mounted) context.pop();
   }
 
   Future<void> _markAsSpam(BuildContext context, Email header) async {
-    final nextEmailId = await _getNextEmailIdIfNeeded(header);
-    if (!context.mounted) return;
-
     final mailbox = await resolveMailboxByRole(
       context,
       ref.read(mailboxRepositoryProvider),
@@ -507,7 +465,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           ),
     );
 
-    if (context.mounted) _navigateTo(context, header, nextEmailId);
+    if (context.mounted) context.pop();
   }
 
   Future<void> _forward(
@@ -532,8 +490,6 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
   }
 
   Future<void> _moveTo(BuildContext context, Email header) async {
-    final nextEmailId = await _getNextEmailIdIfNeeded(header);
-
     final mailboxRepo = ref.read(mailboxRepositoryProvider);
     final mailboxes =
         await mailboxRepo.observeMailboxes(header.accountId).first;
@@ -582,13 +538,10 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           ),
     );
 
-    if (context.mounted) _navigateTo(context, header, nextEmailId);
+    if (context.mounted) context.pop();
   }
 
   Future<void> _snooze(BuildContext context, Email header) async {
-    final nextEmailId = await _getNextEmailIdIfNeeded(header);
-    if (!context.mounted) return;
-
     final until = await showModalBottomSheet<DateTime>(
       context: context,
       builder: (ctx) => const SnoozePicker(),
@@ -616,7 +569,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           ),
         ),
       );
-      _navigateTo(context, header, nextEmailId);
+      context.pop();
     }
   }
 

lib/ui/screens/email_list_screen.dart

@@ -8,7 +8,6 @@ import 'package:intl/intl.dart';
 import 'package:sharedinbox/core/models/account.dart';
 import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/undo_action.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart';
 import 'package:sharedinbox/core/repositories/email_repository.dart';
 import 'package:sharedinbox/di.dart';
 import 'package:sharedinbox/ui/screens/email_action_helpers.dart';
@@ -149,21 +148,16 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
   Widget build(BuildContext context) {
     final repo = ref.watch(emailRepositoryProvider);
     final accountAsync = ref.watch(accountByIdProvider(widget.accountId));
-    final prefs =
-        ref.watch(userPreferencesProvider).value ?? const UserPreferences();
-    final menuAtBottom = prefs.menuPosition == MenuPosition.bottom;
 
     return Scaffold(
-      appBar: _buildAppBar(repo, accountAsync, menuAtBottom: menuAtBottom),
+      appBar: _buildAppBar(repo, accountAsync),
       drawer: _selecting
           ? null
           : FolderDrawer(
               accountId: widget.accountId,
               currentMailboxPath: widget.mailboxPath,
             ),
-      bottomNavigationBar: _selecting
-          ? _selectionBottomBar()
-          : (menuAtBottom ? _folderNavBottomBar() : null),
+      bottomNavigationBar: _selecting ? _selectionBottomBar() : null,
       body: Column(
         children: [
           _buildSyncErrorBanner(),
@@ -179,14 +173,12 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
 
   PreferredSizeWidget _buildAppBar(
     EmailRepository emailRepo,
-    AsyncValue<Account?> accountAsync, {
-    required bool menuAtBottom,
-  }) {
+    AsyncValue<Account?> accountAsync,
+  ) {
     final selectionCount =
         _searching ? _selectedSearchIds.length : _selectedThreadIds.length;
 
     return AppBar(
-      automaticallyImplyLeading: !menuAtBottom,
       leading: _selecting
           ? IconButton(
               icon: const Icon(Icons.close),
@@ -309,22 +301,6 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
     );
   }
 
-  Widget _folderNavBottomBar() {
-    return BottomAppBar(
-      child: Row(
-        children: [
-          Builder(
-            builder: (context) => IconButton(
-              icon: const Icon(Icons.menu),
-              tooltip: 'Open folders',
-              onPressed: () => Scaffold.of(context).openDrawer(),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
   Widget _selectionBottomBar() {
     return BottomAppBar(
       child: Row(

lib/ui/screens/mailbox_list_screen.dart

@@ -4,7 +4,6 @@ import 'package:go_router/go_router.dart';
 
 import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/mailbox.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart';
 import 'package:sharedinbox/core/repositories/email_repository.dart';
 import 'package:sharedinbox/di.dart';
 import 'package:sharedinbox/ui/widgets/folder_drawer.dart';
@@ -18,12 +17,8 @@ class MailboxListScreen extends ConsumerWidget {
     final mailboxRepo = ref.watch(mailboxRepositoryProvider);
     final emailRepo = ref.watch(emailRepositoryProvider);
     final accountAsync = ref.watch(accountByIdProvider(accountId));
-    final prefs =
-        ref.watch(userPreferencesProvider).value ?? const UserPreferences();
-    final menuAtBottom = prefs.menuPosition == MenuPosition.bottom;
     return Scaffold(
       appBar: AppBar(
-        automaticallyImplyLeading: !menuAtBottom,
         title: const Text('Folders'),
         actions: [
           IconButton(
@@ -47,19 +42,6 @@ class MailboxListScreen extends ConsumerWidget {
         ],
       ),
       drawer: FolderDrawer(accountId: accountId),
-      bottomNavigationBar: menuAtBottom
-          ? BottomAppBar(
-              child: Row(
-                children: [
-                  IconButton(
-                    icon: const Icon(Icons.menu),
-                    tooltip: 'Open folders',
-                    onPressed: () => Scaffold.of(context).openDrawer(),
-                  ),
-                ],
-              ),
-            )
-          : null,
       body: Column(
         children: [
           // ── Failed-mutation banner ───────────────────────────────────────

lib/ui/screens/thread_detail_screen.dart

@@ -7,7 +7,6 @@ import 'package:intl/intl.dart';
 
 import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/undo_action.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart';
 import 'package:sharedinbox/core/utils/html_utils.dart';
 import 'package:sharedinbox/di.dart';
 import 'package:sharedinbox/ui/widgets/secure_email_webview.dart';
@@ -29,16 +28,9 @@ class ThreadDetailScreen extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final repo = ref.watch(emailRepositoryProvider);
-    final prefs =
-        ref.watch(userPreferencesProvider).value ?? const UserPreferences();
-    final buttonAtBottom = prefs.mailViewButtonPosition == MenuPosition.bottom;
 
     return Scaffold(
-      appBar: AppBar(
-        title: const Text('Thread'),
-        automaticallyImplyLeading: !buttonAtBottom,
-      ),
-      bottomNavigationBar: buttonAtBottom ? _buildBackButtonBar(context) : null,
+      appBar: AppBar(title: const Text('Thread')),
       body: StreamBuilder<List<Email>>(
         stream: repo.observeEmailsInThread(accountId, mailboxPath, threadId),
         builder: (context, snapshot) {
@@ -68,20 +60,6 @@ class ThreadDetailScreen extends ConsumerWidget {
       ),
     );
   }
-
-  Widget _buildBackButtonBar(BuildContext context) {
-    return BottomAppBar(
-      child: Row(
-        children: [
-          IconButton(
-            icon: const Icon(Icons.arrow_back),
-            tooltip: 'Back',
-            onPressed: () => context.pop(),
-          ),
-        ],
-      ),
-    );
-  }
 }
 
 class _EmailMessageCard extends ConsumerStatefulWidget {

lib/ui/screens/user_preferences_screen.dart

@@ -1,145 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-import 'package:sharedinbox/core/models/user_preferences.dart';
-import 'package:sharedinbox/di.dart';
-
-class UserPreferencesScreen extends ConsumerWidget {
-  const UserPreferencesScreen({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final prefsAsync = ref.watch(userPreferencesProvider);
-
-    return Scaffold(
-      appBar: AppBar(title: const Text('Preferences')),
-      body: prefsAsync.when(
-        loading: () => const Center(child: CircularProgressIndicator()),
-        error: (_, __) =>
-            const Center(child: Text('Error loading preferences')),
-        data: (prefs) => ListView(
-          children: [
-            ListTile(
-              title: Text(
-                'Menu bar position',
-                style: Theme.of(context).textTheme.titleSmall,
-              ),
-              subtitle: const Text(
-                'Where the folder navigation menu is shown in the mailbox view.',
-              ),
-            ),
-            RadioGroup<MenuPosition>(
-              groupValue: prefs.menuPosition,
-              onChanged: (value) {
-                if (value == null) return;
-                unawaited(
-                  ref
-                      .read(userPreferencesRepositoryProvider)
-                      .updateMenuPosition(value),
-                );
-              },
-              child: const Column(
-                children: [
-                  RadioListTile<MenuPosition>(
-                    title: Text('Bottom (default)'),
-                    subtitle: Text(
-                      'Open folder navigation from a button at the bottom of the screen.',
-                    ),
-                    value: MenuPosition.bottom,
-                  ),
-                  RadioListTile<MenuPosition>(
-                    title: Text('Top'),
-                    subtitle: Text(
-                      'Open folder navigation from the hamburger icon in the top bar.',
-                    ),
-                    value: MenuPosition.top,
-                  ),
-                ],
-              ),
-            ),
-            const Divider(),
-            ListTile(
-              title: Text(
-                'Single mail view button position',
-                style: Theme.of(context).textTheme.titleSmall,
-              ),
-              subtitle: const Text(
-                'Where the back button is shown in the single mail view.',
-              ),
-            ),
-            RadioGroup<MenuPosition>(
-              groupValue: prefs.mailViewButtonPosition,
-              onChanged: (value) {
-                if (value == null) return;
-                unawaited(
-                  ref
-                      .read(userPreferencesRepositoryProvider)
-                      .updateMailViewButtonPosition(value),
-                );
-              },
-              child: const Column(
-                children: [
-                  RadioListTile<MenuPosition>(
-                    title: Text('Bottom (default)'),
-                    subtitle: Text(
-                      'Show the back button at the bottom of the screen.',
-                    ),
-                    value: MenuPosition.bottom,
-                  ),
-                  RadioListTile<MenuPosition>(
-                    title: Text('Top'),
-                    subtitle: Text(
-                      'Show the back button in the top bar.',
-                    ),
-                    value: MenuPosition.top,
-                  ),
-                ],
-              ),
-            ),
-            const Divider(),
-            ListTile(
-              title: Text(
-                'After mail action',
-                style: Theme.of(context).textTheme.titleSmall,
-              ),
-              subtitle: const Text(
-                'What to show after deleting, archiving, or otherwise handling a message.',
-              ),
-            ),
-            RadioGroup<AfterMailViewAction>(
-              groupValue: prefs.afterMailViewAction,
-              onChanged: (value) {
-                if (value == null) return;
-                unawaited(
-                  ref
-                      .read(userPreferencesRepositoryProvider)
-                      .updateAfterMailViewAction(value),
-                );
-              },
-              child: const Column(
-                children: [
-                  RadioListTile<AfterMailViewAction>(
-                    title: Text('Next message (default)'),
-                    subtitle: Text(
-                      'Show the next message in the mailbox.',
-                    ),
-                    value: AfterMailViewAction.nextMessage,
-                  ),
-                  RadioListTile<AfterMailViewAction>(
-                    title: Text('Return to mailbox'),
-                    subtitle: Text(
-                      'Return to the message list.',
-                    ),
-                    value: AfterMailViewAction.showMailbox,
-                  ),
-                ],
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

pubspec.lock

@@ -659,10 +659,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.17.0"
   mime:
     dependency: "direct main"
     description:
@@ -1088,26 +1088,26 @@ packages:
     dependency: "direct dev"
     description:
       name: test
-      sha256: "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20"
+      sha256: "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7"
       url: "https://pub.dev"
     source: hosted
-    version: "1.31.0"
+    version: "1.30.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
+      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.11"
+    version: "0.7.10"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34"
+      sha256: "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.17"
+    version: "0.6.16"
   timezone:
     dependency: transitive
     description:

scripts/agent_loop.py

@@ -32,7 +32,7 @@ Output is written to ~/.sharedinbox-agent-logs/<session>-<timestamp>.log.
 To resume the Claude conversation, look up the session UUID first:
 
   scripts/agent_loop.py list          # shows NAME and UUID columns
-  claude --resume <uuid> --dangerously-skip-permissions   # use the UUID, NOT the session name
+  claude --resume <uuid>              # use the UUID, NOT the session name
 """
 
 import argparse
@@ -251,24 +251,6 @@ def _open_issue_prs() -> list[dict]:
     return issue_prs
 
 
-def _open_renovate_prs() -> list[dict]:
-    """Return all open PRs from Renovate (renovate/* branches), oldest-first."""
-    result = subprocess.run(
-        ["fgj", "--hostname", "codeberg.org", "pr", "list",
-         "--repo", REPO, "--state", "open", "--json"],
-        capture_output=True, text=True,
-    )
-    if result.returncode != 0 or not result.stdout.strip():
-        return []
-    prs = json.loads(result.stdout)
-    renovate_prs = [
-        pr for pr in prs
-        if (pr.get("head", {}).get("ref") or "").startswith("renovate/")
-    ]
-    renovate_prs.sort(key=lambda p: p["number"])
-    return renovate_prs
-
-
 def _latest_ci_run_for_pr(pr_number: int) -> dict | None:
     """Return the latest CI run triggered by a pull_request event for the given PR number."""
     pr_ref = f"#{pr_number}"
@@ -542,7 +524,7 @@ def cmd_list() -> int:
 
     sessions.sort(reverse=True)
     total = len(sessions)
-    print(f"  {'DATE':<16}  {'NAME':<20}  UUID  (use with: claude --resume <uuid> --dangerously-skip-permissions)")
+    print(f"  {'DATE':<16}  {'NAME':<20}  UUID  (use with: claude --resume <uuid>)")
     print(f"  {'-'*16}  {'-'*20}  {'-'*36}")
     for mtime, name, sid in sessions[:20]:
         ts = datetime.fromtimestamp(mtime).strftime("%Y-%m-%d %H:%M")
@@ -626,9 +608,9 @@ def _run_loop() -> int:
         session_name = state.get("session_name")
         uuid = _find_session_uuid(session_name) if session_name else None
         if uuid:
-            resume_cmd = f"claude --resume {shlex.quote(uuid)} --dangerously-skip-permissions"
+            resume_cmd = f"claude --resume {shlex.quote(uuid)}"
         elif session_name:
-            resume_cmd = f"claude --resume <uuid> --dangerously-skip-permissions  # run: scripts/agent_loop.py list"
+            resume_cmd = f"claude --resume <uuid>  # run: scripts/agent_loop.py list"
         else:
             resume_cmd = ""
         git_info = _git_summary()
@@ -657,7 +639,7 @@ def _run_loop() -> int:
         session_name = f"plan-issue-{pending_issue}"
         uuid = _find_session_uuid(session_name)
         if uuid:
-            resume_cmd = f"claude --resume {shlex.quote(uuid)} --dangerously-skip-permissions"
+            resume_cmd = f"claude --resume {shlex.quote(uuid)}"
             _comment_issue(
                 pending_issue,
                 f"Planning complete. To resume this session:\n\n```\n{resume_cmd}\n```",
@@ -846,40 +828,6 @@ def _run_loop() -> int:
                 print(f"Merged PR #{pr_number}.")
             return 0
 
-    # ── 2c. Catch-up: merge Renovate PRs with passing CI ─────────────────────
-    # The merge-renovate CI job only fires on pull_request events. If a Renovate
-    # PR had CI run before that job was added (or the automerge label was absent),
-    # it stays open forever. Detect and merge those here.
-    for pr in _open_renovate_prs():
-        pr_number = pr["number"]
-        pr_url = f"{REPO_URL}/pulls/{pr_number}"
-        pr_run = _latest_ci_run_for_pr(pr_number)
-
-        if pr_run and pr_run.get("status") == "running":
-            print(f"Catch-up (Renovate): CI {_ci_run_url(pr_run['id'])} on PR #{pr_number} still running. Waiting.")
-            return 0
-
-        if pr_run and pr_run.get("status") in ("failure", "error"):
-            print(f"Catch-up (Renovate): CI {_ci_run_url(pr_run['id'])} on PR #{pr_number} failed — skipping.")
-            continue
-
-        if pr_run and pr_run.get("status") == "success":
-            print(f"Catch-up (Renovate): CI passed on PR #{pr_number} ({pr_url}) — merging.")
-            try:
-                _merge_pr(pr_number)
-            except RuntimeError as e:
-                print(f"Catch-up (Renovate): merge of PR #{pr_number} failed: {e} — skipping.")
-                continue
-            branch = pr.get("head", {}).get("ref", "")
-            if _find_pr_for_branch(branch):
-                print(f"Catch-up (Renovate): PR #{pr_number} still open after merge — skipping.")
-                continue
-            print(f"Catch-up (Renovate): merged PR #{pr_number}.")
-            return 0
-
-        if pr_run is None:
-            print(f"Catch-up (Renovate): no CI run for PR #{pr_number} ({pr_url}) — skipping (needs manual review).")
-
     # ── 3. Global CI check (main branch only) ────────────────────────────────
     run = _latest_main_ci_run()
 

scripts/check_coverage.dart

@@ -20,9 +20,7 @@ const _noCode = {
   'lib/core/repositories/sync_log_repository.dart',
   'lib/core/repositories/undo_repository.dart',
   'lib/core/repositories/search_history_repository.dart',
-  'lib/core/repositories/user_preferences_repository.dart',
   'lib/core/models/undo_action.dart',
-  'lib/core/models/user_preferences.dart',
   'lib/core/storage/secure_storage.dart',
 };
 
@@ -75,8 +73,6 @@ const _excluded = {
   'lib/data/repositories/sync_log_repository_impl.dart',
   'lib/data/repositories/undo_repository_impl.dart',
   'lib/data/repositories/search_history_repository_impl.dart',
-  'lib/data/repositories/user_preferences_repository_impl.dart',
-  'lib/ui/screens/user_preferences_screen.dart',
   'lib/core/services/update_service.dart',
 };
 

scripts/test_agent_loop.py

@@ -714,7 +714,7 @@ class TestRunLoopResumeCommand(unittest.TestCase):
              contextlib.redirect_stdout(buf):
             agent_loop._run_loop()
         output = buf.getvalue()
-        self.assertIn(f"claude --resume {fake_uuid} --dangerously-skip-permissions", output)
+        self.assertIn(f"claude --resume {fake_uuid}", output)
 
     def test_resume_shows_list_hint_when_uuid_not_found(self):
         buf = io.StringIO()

test/unit/migration_test.dart

@@ -14,7 +14,7 @@ void main() {
   group('Migration', () {
     test('schemaVersion matches expected value', () async {
       final db = AppDatabase(NativeDatabase.memory());
-      expect(db.schemaVersion, 36);
+      expect(db.schemaVersion, 33);
       await db.close();
     });
 
@@ -199,16 +199,6 @@ void main() {
       expect(syncLogColumns, contains('error_stack_trace'));
       expect(syncLogColumns, contains('is_permanent'));
 
-      // v34: user_preferences table.
-      await db.customSelect('SELECT count(*) FROM user_preferences').get();
-
-      // v35: mail_view_button_position column on user_preferences.
-      final userPrefsColumns = await _tableColumns(db, 'user_preferences');
-      expect(userPrefsColumns, contains('mail_view_button_position'));
-
-      // v36: after_mail_view_action column on user_preferences.
-      expect(userPrefsColumns, contains('after_mail_view_action'));
-
       await db.close();
       if (dbFile.existsSync()) dbFile.deleteSync();
     });
@@ -401,21 +391,11 @@ void main() {
       expect(syncLogColumns, contains('error_stack_trace'));
       expect(syncLogColumns, contains('is_permanent'));
 
-      // v34: user_preferences table.
-      await db.customSelect('SELECT count(*) FROM user_preferences').get();
-
-      // v35: mail_view_button_position column on user_preferences.
-      final userPrefsColumns = await _tableColumns(db, 'user_preferences');
-      expect(userPrefsColumns, contains('mail_view_button_position'));
-
-      // v36: after_mail_view_action column on user_preferences.
-      expect(userPrefsColumns, contains('after_mail_view_action'));
-
       await db.close();
       if (dbFile.existsSync()) dbFile.deleteSync();
     });
 
-    test('fresh install creates all tables at schemaVersion 36', () async {
+    test('fresh install creates all tables at schemaVersion 33', () async {
       final db = AppDatabase(NativeDatabase.memory());
       await db.select(db.accounts).get();
 
@@ -442,7 +422,6 @@ void main() {
           'local_sieve_scripts', // v29
           'share_keys', // v31
           'local_sieve_applied', // v32
-          'user_preferences', // v34
         ]),
       );
 
@@ -462,13 +441,6 @@ void main() {
       expect(syncLogColumns, contains('error_stack_trace'));
       expect(syncLogColumns, contains('is_permanent'));
 
-      // v35: mail_view_button_position column on user_preferences.
-      final userPrefsColumns = await _tableColumns(db, 'user_preferences');
-      expect(userPrefsColumns, contains('mail_view_button_position'));
-
-      // v36: after_mail_view_action column on user_preferences.
-      expect(userPrefsColumns, contains('after_mail_view_action'));
-
       await db.close();
     });
   });

test/widget/email_list_screen_test.dart

@@ -316,7 +316,7 @@ void main() {
       await tester.pumpAndSettle();
 
       expect(find.text('INBOX'), findsOneWidget);
-      expect(find.byIcon(Icons.close), findsNothing);
+      expect(find.byType(BottomAppBar), findsNothing);
     });
 
     testWidgets('tapping clear icon in search bar clears results', (

test/widget/helpers.dart

@@ -14,7 +14,6 @@ import 'package:sharedinbox/core/models/discovery_result.dart';
 import 'package:sharedinbox/core/models/draft.dart';
 import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/mailbox.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart';
 import 'package:sharedinbox/core/repositories/account_repository.dart';
 import 'package:sharedinbox/core/repositories/draft_repository.dart';
 import 'package:sharedinbox/core/repositories/email_repository.dart';
@@ -22,7 +21,6 @@ import 'package:sharedinbox/core/repositories/mailbox_repository.dart';
 import 'package:sharedinbox/core/repositories/search_history_repository.dart';
 import 'package:sharedinbox/core/repositories/share_key_repository.dart';
 import 'package:sharedinbox/core/repositories/sync_log_repository.dart';
-import 'package:sharedinbox/core/repositories/user_preferences_repository.dart';
 import 'package:sharedinbox/core/services/account_discovery_service.dart';
 import 'package:sharedinbox/core/services/connection_test_service.dart';
 import 'package:sharedinbox/core/services/managesieve_probe_service.dart';
@@ -41,7 +39,6 @@ import 'package:sharedinbox/ui/screens/email_list_screen.dart';
 import 'package:sharedinbox/ui/screens/mailbox_list_screen.dart';
 import 'package:sharedinbox/ui/screens/search_screen.dart';
 import 'package:sharedinbox/ui/screens/thread_detail_screen.dart';
-import 'package:sharedinbox/ui/screens/user_preferences_screen.dart';
 
 // ---------------------------------------------------------------------------
 // Fake repositories
@@ -414,7 +411,6 @@ class _NoOpManageSieveProbeService implements ManageSieveProbeService {
 Widget buildApp({
   required String initialLocation,
   required List<Override> overrides,
-  UserPreferencesRepository? userPreferences,
 }) {
   final testRouter = GoRouter(
     initialLocation: initialLocation,
@@ -435,10 +431,6 @@ Widget buildApp({
             path: 'send',
             builder: (ctx, state) => const AccountSendScreen(),
           ),
-          GoRoute(
-            path: 'preferences',
-            builder: (ctx, state) => const UserPreferencesScreen(),
-          ),
           GoRoute(
             path: ':accountId/edit',
             builder: (ctx, state) => EditAccountScreen(
@@ -523,9 +515,6 @@ Widget buildApp({
       syncLogRepositoryProvider.overrideWithValue(
         const NoOpSyncLogRepository(),
       ),
-      userPreferencesRepositoryProvider.overrideWithValue(
-        userPreferences ?? FakeUserPreferencesRepository(),
-      ),
       ...overrides,
       manageSieveProbeServiceProvider.overrideWith(
         (ref) => _NoOpManageSieveProbeService(),
@@ -622,42 +611,6 @@ Email testEmail({
       listUnsubscribeHeader: listUnsubscribeHeader,
     );
 
-class FakeUserPreferencesRepository implements UserPreferencesRepository {
-  FakeUserPreferencesRepository({
-    this.menuPosition = MenuPosition.bottom,
-    this.mailViewButtonPosition = MenuPosition.bottom,
-    this.afterMailViewAction = AfterMailViewAction.nextMessage,
-  });
-
-  MenuPosition menuPosition;
-  MenuPosition mailViewButtonPosition;
-  AfterMailViewAction afterMailViewAction;
-
-  @override
-  Stream<UserPreferences> observePreferences() => Stream.value(
-        UserPreferences(
-          menuPosition: menuPosition,
-          mailViewButtonPosition: mailViewButtonPosition,
-          afterMailViewAction: afterMailViewAction,
-        ),
-      );
-
-  @override
-  Future<void> updateMenuPosition(MenuPosition position) async {
-    menuPosition = position;
-  }
-
-  @override
-  Future<void> updateMailViewButtonPosition(MenuPosition position) async {
-    mailViewButtonPosition = position;
-  }
-
-  @override
-  Future<void> updateAfterMailViewAction(AfterMailViewAction action) async {
-    afterMailViewAction = action;
-  }
-}
-
 class FakeSearchHistoryRepository implements SearchHistoryRepository {
   final List<String> _history = [];
 

test/widget/thread_detail_screen_test.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 import 'package:sharedinbox/core/models/email.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart';
 import 'package:sharedinbox/di.dart';
 
 import 'helpers.dart';
@@ -143,60 +142,6 @@ void main() {
       expect(find.byIcon(Icons.expand_more), findsOneWidget);
     });
 
-    testWidgets('shows bottom app bar with back button by default', (
-      tester,
-    ) async {
-      final email = _threadEmail();
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/threads/thread-1',
-          overrides: [
-            accountRepositoryProvider.overrideWithValue(
-              FakeAccountRepository([kTestAccount]),
-            ),
-            mailboxRepositoryProvider.overrideWithValue(
-              FakeMailboxRepository(),
-            ),
-            emailRepositoryProvider.overrideWithValue(
-              FakeEmailRepository(emails: [email]),
-            ),
-          ],
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(find.byType(BottomAppBar), findsOneWidget);
-      expect(find.byIcon(Icons.arrow_back), findsOneWidget);
-    });
-
-    testWidgets('hides bottom app bar when button position is top', (
-      tester,
-    ) async {
-      final email = _threadEmail();
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/threads/thread-1',
-          userPreferences: FakeUserPreferencesRepository(
-            mailViewButtonPosition: MenuPosition.top,
-          ),
-          overrides: [
-            accountRepositoryProvider.overrideWithValue(
-              FakeAccountRepository([kTestAccount]),
-            ),
-            mailboxRepositoryProvider.overrideWithValue(
-              FakeMailboxRepository(),
-            ),
-            emailRepositoryProvider.overrideWithValue(
-              FakeEmailRepository(emails: [email]),
-            ),
-          ],
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(find.byType(BottomAppBar), findsNothing);
-    });
-
     testWidgets('flagged email shows star icon', (tester) async {
       final email = _threadEmail(isFlagged: true);
       await tester.pumpWidget(

test/widget/user_preferences_screen_test.dart

@@ -1,186 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import 'package:sharedinbox/core/models/user_preferences.dart';
-import 'package:sharedinbox/di.dart';
-import 'package:sharedinbox/ui/screens/user_preferences_screen.dart';
-
-import 'helpers.dart';
-
-void main() {
-  group('UserPreferencesScreen', () {
-    testWidgets('shows both menu position options', (tester) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/preferences',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(find.text('Menu bar position'), findsOneWidget);
-      expect(find.text('Bottom (default)'), findsNWidgets(2));
-      expect(find.text('Top'), findsNWidgets(2));
-    });
-
-    testWidgets('shows single mail view button position section', (
-      tester,
-    ) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/preferences',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(
-        find.text('Single mail view button position'),
-        findsOneWidget,
-      );
-    });
-
-    testWidgets('menu position bottom option is selected by default', (
-      tester,
-    ) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/preferences',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      final radioGroups = find.byType(RadioGroup<MenuPosition>);
-      final menuGroup =
-          tester.widget<RadioGroup<MenuPosition>>(radioGroups.first);
-      expect(menuGroup.groupValue, MenuPosition.bottom);
-    });
-
-    testWidgets('mail view button position bottom is selected by default', (
-      tester,
-    ) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/preferences',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      final radioGroups = find.byType(RadioGroup<MenuPosition>);
-      final mailViewGroup =
-          tester.widget<RadioGroup<MenuPosition>>(radioGroups.last);
-      expect(mailViewGroup.groupValue, MenuPosition.bottom);
-    });
-
-    testWidgets('tapping Top in menu position section updates the repo', (
-      tester,
-    ) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/preferences',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.text('Top').first);
-      await tester.pumpAndSettle();
-
-      final repo = ProviderScope.containerOf(
-        tester.element(find.byType(UserPreferencesScreen)),
-      ).read(userPreferencesRepositoryProvider)
-          as FakeUserPreferencesRepository;
-
-      expect(repo.menuPosition, MenuPosition.top);
-    });
-
-    testWidgets(
-        'tapping Top in mail view button position section updates the repo', (
-      tester,
-    ) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/preferences',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.text('Top').last);
-      await tester.pumpAndSettle();
-
-      final repo = ProviderScope.containerOf(
-        tester.element(find.byType(UserPreferencesScreen)),
-      ).read(userPreferencesRepositoryProvider)
-          as FakeUserPreferencesRepository;
-
-      expect(repo.mailViewButtonPosition, MenuPosition.top);
-    });
-
-    testWidgets('shows after mail action section', (tester) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/preferences',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      // Scroll down to reveal the new section below the fold.
-      await tester.drag(find.byType(ListView), const Offset(0, -500));
-      await tester.pumpAndSettle();
-
-      expect(find.text('After mail action'), findsOneWidget);
-      expect(find.text('Next message (default)'), findsOneWidget);
-      expect(find.text('Return to mailbox'), findsOneWidget);
-    });
-
-    testWidgets('after mail action next message is selected by default', (
-      tester,
-    ) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/preferences',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.drag(find.byType(ListView), const Offset(0, -500));
-      await tester.pumpAndSettle();
-
-      final radioGroups = find.byType(RadioGroup<AfterMailViewAction>);
-      final group =
-          tester.widget<RadioGroup<AfterMailViewAction>>(radioGroups.first);
-      expect(group.groupValue, AfterMailViewAction.nextMessage);
-    });
-
-    testWidgets('tapping Return to mailbox updates the repo', (
-      tester,
-    ) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/preferences',
-          overrides: baseOverrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.drag(find.byType(ListView), const Offset(0, -500));
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.text('Return to mailbox'));
-      await tester.pumpAndSettle();
-
-      final repo = ProviderScope.containerOf(
-        tester.element(find.byType(UserPreferencesScreen)),
-      ).read(userPreferencesRepositoryProvider)
-          as FakeUserPreferencesRepository;
-
-      expect(repo.afterMailViewAction, AfterMailViewAction.showMailbox);
-    });
-  });
-}