feat: add 'Mark all as read' action to mailbox overflow menu (U8)

Adds markAllAsRead(accountId, mailboxPath) to EmailRepository — bulk
marks all unread emails as seen (optimistic local update + pending
change per email for server sync). A PopupMenuButton in EmailListScreen
exposes this as 'Mark all as read'. Contract test verifies the mailbox-
scoped behaviour.

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

lib/core/repositories/search_history_repository.dart

@@ -1,5 +0,0 @@
-abstract interface class SearchHistoryRepository {
-  Future<List<String>> getRecentSearches();
-  Future<void> saveSearch(String query);
-  Future<void> clearHistory();
-}

lib/data/db/database.dart

@@ -234,13 +234,6 @@ class Drafts extends Table {
   TextColumn get imapServerId => text().nullable()();
 }
 
-@DataClassName('SearchHistoryRow')
-class SearchHistoryEntries extends Table {
-  IntColumn get id => integer().autoIncrement()();
-  TextColumn get query => text()();
-  DateTimeColumn get searchedAt => dateTime()();
-}
-
 @DataClassName('UndoActionRow')
 class UndoActions extends Table {
   TextColumn get id => text()();
@@ -270,14 +263,13 @@ class UndoActions extends Table {
     SyncLogMailboxes,
     SyncHealth,
     UndoActions,
-    SearchHistoryEntries,
   ],
 )
 class AppDatabase extends _$AppDatabase {
   AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection());
 
   @override
-  int get schemaVersion => 27;
+  int get schemaVersion => 26;
 
   Future<void> _createEmailFts() async {
     await customStatement('''
@@ -500,9 +492,6 @@ class AppDatabase extends _$AppDatabase {
               SELECT rowid, subject, preview, from_json FROM emails
             ''');
           }
-          if (from < 27) {
-            await m.createTable(searchHistoryEntries);
-          }
         },
       );
 }

lib/data/repositories/search_history_repository_impl.dart

@@ -1,57 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:sharedinbox/core/repositories/search_history_repository.dart';
-import 'package:sharedinbox/data/db/database.dart';
-
-class SearchHistoryRepositoryImpl implements SearchHistoryRepository {
-  SearchHistoryRepositoryImpl(this._db);
-  final AppDatabase _db;
-
-  static const _maxEntries = 10;
-
-  @override
-  Future<List<String>> getRecentSearches() async {
-    final rows = await (_db.select(_db.searchHistoryEntries)
-          ..orderBy([(t) => OrderingTerm.desc(t.searchedAt)])
-          ..limit(_maxEntries))
-        .get();
-    return rows.map((r) => r.query).toList();
-  }
-
-  @override
-  Future<void> saveSearch(String query) async {
-    final trimmed = query.trim();
-    if (trimmed.isEmpty) return;
-
-    await _db.transaction(() async {
-      // Remove existing entry for same query (deduplication).
-      await (_db.delete(_db.searchHistoryEntries)
-            ..where((t) => t.query.equals(trimmed)))
-          .go();
-
-      await _db.into(_db.searchHistoryEntries).insert(
-            SearchHistoryEntriesCompanion.insert(
-              query: trimmed,
-              searchedAt: DateTime.now(),
-            ),
-          );
-
-      // Prune to the most recent _maxEntries.
-      final keepIds = await (_db.select(_db.searchHistoryEntries)
-            ..orderBy([(t) => OrderingTerm.desc(t.searchedAt)])
-            ..limit(_maxEntries))
-          .map((r) => r.id)
-          .get();
-
-      if (keepIds.isNotEmpty) {
-        await (_db.delete(_db.searchHistoryEntries)
-              ..where((t) => t.id.isNotIn(keepIds)))
-            .go();
-      }
-    });
-  }
-
-  @override
-  Future<void> clearHistory() async {
-    await _db.delete(_db.searchHistoryEntries).go();
-  }
-}

lib/di.dart

@@ -9,7 +9,6 @@ import 'package:sharedinbox/core/repositories/account_repository.dart';
 import 'package:sharedinbox/core/repositories/draft_repository.dart';
 import 'package:sharedinbox/core/repositories/email_repository.dart';
 import 'package:sharedinbox/core/repositories/mailbox_repository.dart';
-import 'package:sharedinbox/core/repositories/search_history_repository.dart';
 import 'package:sharedinbox/core/repositories/undo_repository.dart';
 import 'package:sharedinbox/core/services/account_discovery_service.dart';
 import 'package:sharedinbox/core/services/connection_test_service.dart';
@@ -26,7 +25,6 @@ import 'package:sharedinbox/data/repositories/account_repository_impl.dart';
 import 'package:sharedinbox/data/repositories/draft_repository_impl.dart';
 import 'package:sharedinbox/data/repositories/email_repository_impl.dart';
 import 'package:sharedinbox/data/repositories/mailbox_repository_impl.dart';
-import 'package:sharedinbox/data/repositories/search_history_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/storage/flutter_secure_storage_impl.dart';
@@ -89,11 +87,6 @@ final undoRepositoryProvider = Provider<UndoRepository>((ref) {
   return UndoRepositoryImpl(ref.watch(dbProvider));
 });
 
-final searchHistoryRepositoryProvider =
-    Provider<SearchHistoryRepository>((ref) {
-  return SearchHistoryRepositoryImpl(ref.watch(dbProvider));
-});
-
 final syncLogRepositoryProvider = Provider((ref) {
   return SyncLogRepositoryImpl(ref.watch(dbProvider));
 });

lib/ui/screens/account_list_screen.dart

@@ -60,7 +60,20 @@ class AccountListScreen extends ConsumerWidget {
           }
           final accounts = snap.data!;
           if (accounts.isEmpty) {
-            return const _OnboardingView();
+            return Center(
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  const Text('No accounts yet.'),
+                  const SizedBox(height: 12),
+                  FilledButton.icon(
+                    onPressed: () => context.push('/accounts/add'),
+                    icon: const Icon(Icons.add),
+                    label: const Text('Add account'),
+                  ),
+                ],
+              ),
+            );
           }
           return ListView.builder(
             itemCount: accounts.length,
@@ -220,112 +233,6 @@ class _AccountTile extends ConsumerWidget {
   }
 }
 
-class _OnboardingView extends StatelessWidget {
-  const _OnboardingView();
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-    return Center(
-      child: SingleChildScrollView(
-        padding: const EdgeInsets.all(24),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Icon(
-              Icons.mail_outline,
-              size: 64,
-              color: theme.colorScheme.primary,
-            ),
-            const SizedBox(height: 16),
-            Text(
-              'Welcome to SharedInbox',
-              style: theme.textTheme.headlineSmall,
-              textAlign: TextAlign.center,
-            ),
-            const SizedBox(height: 8),
-            Text(
-              'Get started in three steps:',
-              style: theme.textTheme.bodyMedium,
-              textAlign: TextAlign.center,
-            ),
-            const SizedBox(height: 24),
-            const _Step(
-              number: '1',
-              title: 'Add an account',
-              description: 'Connect your IMAP or JMAP email account.',
-            ),
-            const _Step(
-              number: '2',
-              title: 'Wait for sync',
-              description:
-                  'SharedInbox downloads your messages in the background.',
-            ),
-            const _Step(
-              number: '3',
-              title: 'Open your inbox',
-              description:
-                  'Tap the account to browse mailboxes and read emails.',
-            ),
-            const SizedBox(height: 32),
-            FilledButton.icon(
-              onPressed: () => context.push('/accounts/add'),
-              icon: const Icon(Icons.add),
-              label: const Text('Add account'),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class _Step extends StatelessWidget {
-  const _Step({
-    required this.number,
-    required this.title,
-    required this.description,
-  });
-
-  final String number;
-  final String title;
-  final String description;
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 8),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          CircleAvatar(
-            radius: 16,
-            backgroundColor: theme.colorScheme.primaryContainer,
-            child: Text(
-              number,
-              style: TextStyle(
-                color: theme.colorScheme.onPrimaryContainer,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-          ),
-          const SizedBox(width: 16),
-          Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(title, style: theme.textTheme.titleSmall),
-                Text(description, style: theme.textTheme.bodySmall),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
 enum _AccountAction { syncLog, verifySync, edit, emailFilters, delete }
 
 /// Whether to surface the "Email filters" (Sieve) entry for [account].

lib/ui/screens/email_detail_screen.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -18,14 +17,6 @@ import 'package:url_launcher/url_launcher.dart';
 
 final _dateFmt = DateFormat('EEE, MMM d yyyy, HH:mm');
 
-void _openLink(String? url, Map<String, String> attrs, dynamic _) {
-  if (url == null) return;
-  final uri = Uri.tryParse(url);
-  if (uri != null) {
-    unawaited(launchUrl(uri, mode: LaunchMode.externalApplication));
-  }
-}
-
 class EmailDetailScreen extends ConsumerStatefulWidget {
   const EmailDetailScreen({super.key, required this.emailId});
   final String emailId;
@@ -69,27 +60,20 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
             tooltip: 'Reply',
             onPressed: header == null
                 ? null
-                : () {
-                    unawaited(_reply(context, header, body, replyAll: false));
-                  },
+                : () => _reply(context, header, body, replyAll: false),
           ),
           IconButton(
             icon: const Icon(Icons.reply_all),
             tooltip: 'Reply all',
             onPressed: header == null
                 ? null
-                : () {
-                    unawaited(_reply(context, header, body, replyAll: true));
-                  },
+                : () => _reply(context, header, body, replyAll: true),
           ),
           IconButton(
             icon: const Icon(Icons.forward),
             tooltip: 'Forward',
-            onPressed: header == null
-                ? null
-                : () {
-                    unawaited(_forward(context, header, body));
-                  },
+            onPressed:
+                header == null ? null : () => _forward(context, header, body),
           ),
           IconButton(
             icon: const Icon(Icons.mark_email_unread_outlined),
@@ -279,31 +263,26 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
     );
   }
 
-  Future<String> _quotedBody(Email header, EmailBody? body) async {
+  String _quotedBody(Email header, EmailBody? body) {
     final date = header.sentAt != null ? _dateFmt.format(header.sentAt!) : '';
     final from =
         header.from.isNotEmpty ? header.from.first.toString() : '(unknown)';
-    final rawText = body?.textBody;
-    final text = (rawText != null && rawText.isNotEmpty)
-        ? rawText
-        : await compute(htmlToPlain, body?.htmlBody ?? '');
+    final text = body?.textBody ?? htmlToPlain(body?.htmlBody ?? '');
     final quoted = text.trim().split('\n').map((l) => '> $l').join('\n');
     return '\n\n— On $date, $from wrote:\n$quoted';
   }
 
-  Future<void> _reply(
+  void _reply(
     BuildContext context,
     Email header,
     EmailBody? body, {
     required bool replyAll,
-  }) async {
+  }) {
     final to = header.from.isNotEmpty ? header.from.first.email : '';
     final subject = (header.subject?.startsWith('Re:') ?? false)
         ? header.subject!
         : 'Re: ${header.subject ?? ''}';
     final cc = replyAll ? header.to.map((a) => a.email).join(', ') : '';
-    final quoted = await _quotedBody(header, body);
-    if (!context.mounted) return;
     unawaited(
       context.push(
         '/compose',
@@ -311,29 +290,23 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           'replyToEmailId': widget.emailId,
           'prefillTo': to,
           'prefillSubject': subject,
-          'prefillBody': quoted,
+          'prefillBody': _quotedBody(header, body),
           if (cc.isNotEmpty) 'prefillCc': cc,
         },
       ),
     );
   }
 
-  Future<void> _forward(
-    BuildContext context,
-    Email header,
-    EmailBody? body,
-  ) async {
+  void _forward(BuildContext context, Email header, EmailBody? body) {
     final subject = (header.subject?.startsWith('Fwd:') ?? false)
         ? header.subject!
         : 'Fwd: ${header.subject ?? ''}';
-    final quoted = await _quotedBody(header, body);
-    if (!context.mounted) return;
     unawaited(
       context.push(
         '/compose',
         extra: {
           'prefillSubject': subject,
-          'prefillBody': quoted,
+          'prefillBody': _quotedBody(header, body),
         },
       ),
     );
@@ -561,11 +534,7 @@ class _SafeHtmlState extends State<_SafeHtml> {
       (_) => ErrorWidget.builder = prev,
     );
 
-    return Html(
-      data: widget.data,
-      extensions: widget.extensions,
-      onLinkTap: _openLink,
-    );
+    return Html(data: widget.data, extensions: widget.extensions);
   }
 }
 

lib/ui/screens/email_list_screen.dart

@@ -15,14 +15,6 @@ import 'package:sharedinbox/ui/widgets/folder_drawer.dart';
 import 'package:sharedinbox/ui/widgets/snooze_picker.dart';
 
 final _dateFmt = DateFormat('MMM d');
-// Cache formatted dates by local calendar day so DateFormat.format is called
-// at most once per unique date rather than once per list item per rebuild.
-final _formattedDates = <int, String>{};
-
-int _dayKey(DateTime dt) => dt.year * 10000 + dt.month * 100 + dt.day;
-
-String _fmtDate(DateTime dt) =>
-    _formattedDates[_dayKey(dt)] ??= _dateFmt.format(dt);
 
 class EmailListScreen extends ConsumerStatefulWidget {
   const EmailListScreen({
@@ -649,7 +641,7 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
                 const Icon(Icons.star, color: Colors.amber, size: 16),
               const SizedBox(width: 4),
               Text(
-                _fmtDate(t.latestDate),
+                _dateFmt.format(t.latestDate),
                 style: Theme.of(ctx).textTheme.bodySmall,
               ),
             ],

lib/ui/screens/search_screen.dart

@@ -10,11 +10,6 @@ import 'package:sharedinbox/core/utils/logger.dart';
 import 'package:sharedinbox/di.dart';
 import 'package:sharedinbox/ui/widgets/email_tile.dart';
 
-final _searchHistoryProvider =
-    FutureProvider.autoDispose<List<String>>((ref) async {
-  return ref.watch(searchHistoryRepositoryProvider).getRecentSearches();
-});
-
 class SearchScreen extends ConsumerStatefulWidget {
   const SearchScreen({super.key, this.accountId});
   final String? accountId;
@@ -25,24 +20,13 @@ class SearchScreen extends ConsumerStatefulWidget {
 
 class _SearchScreenState extends ConsumerState<SearchScreen> {
   final _ctrl = TextEditingController();
-  final _focusNode = FocusNode();
   Timer? _debounce;
   _SearchResults? _results;
   bool _loading = false;
-  bool _fieldFocused = false;
-
-  @override
-  void initState() {
-    super.initState();
-    _focusNode.addListener(() {
-      if (mounted) setState(() => _fieldFocused = _focusNode.hasFocus);
-    });
-  }
 
   @override
   void dispose() {
     _ctrl.dispose();
-    _focusNode.dispose();
     _debounce?.cancel();
     super.dispose();
   }
@@ -61,12 +45,6 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
 
   Future<void> _search(String query) async {
     setState(() => _loading = true);
-    unawaited(
-      ref
-          .read(searchHistoryRepositoryProvider)
-          .saveSearch(query)
-          .then((_) => ref.invalidate(_searchHistoryProvider)),
-    );
     try {
       final emailRepo = ref.read(emailRepositoryProvider);
       final mailboxRepo = ref.read(mailboxRepositoryProvider);
@@ -134,7 +112,6 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
       appBar: AppBar(
         title: TextField(
           controller: _ctrl,
-          focusNode: _focusNode,
           autofocus: true,
           decoration: const InputDecoration(
             hintText: 'Search folders, addresses, emails…',
@@ -160,9 +137,6 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
   Widget _buildBody() {
     if (_loading) return const Center(child: CircularProgressIndicator());
     if (_results == null) {
-      if (_fieldFocused && _ctrl.text.isEmpty) {
-        return _buildHistoryPanel();
-      }
       return const Center(child: Text('Type 3+ characters to search'));
     }
     final r = _results!;
@@ -195,66 +169,6 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
       ],
     );
   }
-
-  Widget _buildHistoryPanel() {
-    final history = ref.watch(_searchHistoryProvider);
-    return history.when(
-      loading: () => const Center(child: Text('Type 3+ characters to search')),
-      error: (_, __) =>
-          const Center(child: Text('Type 3+ characters to search')),
-      data: (terms) {
-        if (terms.isEmpty) {
-          return const Center(child: Text('Type 3+ characters to search'));
-        }
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(
-              padding: const EdgeInsets.fromLTRB(16, 12, 16, 4),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Text(
-                    'Recent searches',
-                    style: Theme.of(context).textTheme.labelLarge,
-                  ),
-                  TextButton(
-                    onPressed: () async {
-                      await ref
-                          .read(searchHistoryRepositoryProvider)
-                          .clearHistory();
-                      ref.invalidate(_searchHistoryProvider);
-                    },
-                    child: const Text('Clear'),
-                  ),
-                ],
-              ),
-            ),
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 12),
-              child: Wrap(
-                spacing: 8,
-                runSpacing: 4,
-                children: [
-                  for (final term in terms)
-                    ActionChip(
-                      label: Text(term),
-                      onPressed: () {
-                        _ctrl.text = term;
-                        _ctrl.selection = TextSelection.fromPosition(
-                          TextPosition(offset: term.length),
-                        );
-                        unawaited(_search(term));
-                      },
-                    ),
-                ],
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
 }
 
 class _SearchResults {

lib/ui/screens/thread_detail_screen.dart

@@ -10,7 +10,6 @@ import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/undo_action.dart';
 import 'package:sharedinbox/core/utils/html_utils.dart';
 import 'package:sharedinbox/di.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 final _dateFmt = DateFormat('EEE, MMM d, HH:mm');
 
@@ -169,18 +168,6 @@ class _EmailMessageCardState extends ConsumerState<_EmailMessageCard> {
                       extensions: [
                         if (!_loadRemoteImages) _BlockRemoteImagesExtension(),
                       ],
-                      onLinkTap: (url, _, __) {
-                        if (url == null) return;
-                        final uri = Uri.tryParse(url);
-                        if (uri != null) {
-                          unawaited(
-                            launchUrl(
-                              uri,
-                              mode: LaunchMode.externalApplication,
-                            ),
-                          );
-                        }
-                      },
                     ),
                   ] else
                     SelectableText(

plan-claude.md

@@ -43,7 +43,10 @@ Files: `lib/ui/screens/email_list_screen.dart`, `lib/core/utils/format_utils.dar
 
 ### R4 — Done: https://codeberg.org/guettli/sharedinbox/pulls/23
 
-### R5 — Done: https://codeberg.org/guettli/sharedinbox/pulls/45
+### R5 🟡 Handle TLS certificate changes gracefully
+`tls_error.dart` detects TLS errors but they bubble up as generic errors in the sync loop.
+Detect `TlsError` specifically in `_AccountSync` and show a user-facing dialog offering to re-add the account or trust the new certificate.
+Files: `lib/data/imap/tls_error.dart`, `lib/core/sync/account_sync_manager.dart`.
 
 ### R6 — Done: https://codeberg.org/guettli/sharedinbox/pulls/24
 
@@ -104,8 +107,6 @@ Files: `lib/ui/screens/email_list_screen.dart`, `lib/core/repositories/email_rep
 
 ### T2 — Done: https://codeberg.org/guettli/sharedinbox/pulls/31
 
-### T3 — Done: https://codeberg.org/guettli/sharedinbox/pulls/43
-
 ### T3 🟡 Contract tests for all Repository interfaces
 The interfaces in `core/repositories/` have no shared contract test suite. Concrete impls can silently diverge.
 Add a shared `EmailRepositoryContract` abstract test class; run it against both `EmailRepositoryImpl` and any future mock/fake. Mirror this for `MailboxRepository` and `AccountRepository`.
@@ -126,7 +127,10 @@ Files: `test/widget/email_list_screen_test.dart`.
 
 ### A2 — Done: https://codeberg.org/guettli/sharedinbox/pulls/33
 
-### A3 — Done: https://codeberg.org/guettli/sharedinbox/pulls/46
+### A3 🟡 Make AccountSyncManager testable without real IMAP connections
+`AccountSyncManager` accepts `ImapConnectFn` as a dependency but `_JmapAccountSync` constructs its HTTP client internally.
+Pass an injectable `http.Client` to `_JmapAccountSync` (already done in `EmailRepositoryImpl`; mirror the pattern here).
+Files: `lib/core/sync/account_sync_manager.dart`, `test/unit/account_sync_manager_test.dart`.
 
 ### A4 🟡 Replace raw JSON strings in DB with structured encoding
 `fromJson`, `toAddresses`, `ccJson`, `references` are stored as raw JSON strings parsed on every model conversion.

scripts/check_coverage.dart

@@ -17,7 +17,6 @@ const _noCode = {
   'lib/core/repositories/mailbox_repository.dart',
   'lib/core/repositories/sync_log_repository.dart',
   'lib/core/repositories/undo_repository.dart',
-  'lib/core/repositories/search_history_repository.dart',
   'lib/core/models/undo_action.dart',
   'lib/core/storage/secure_storage.dart',
 };
@@ -62,7 +61,6 @@ const _excluded = {
   'lib/data/repositories/mailbox_repository_impl.dart',
   'lib/data/repositories/sync_log_repository_impl.dart',
   'lib/data/repositories/undo_repository_impl.dart',
-  'lib/data/repositories/search_history_repository_impl.dart',
 };
 
 void main() {

test/integration/account_sync_manager_test.dart

@@ -1,7 +1,5 @@
 import 'dart:async';
-import 'dart:io';
 
-import 'package:enough_mail/enough_mail.dart' as imap;
 import 'package:flutter_test/flutter_test.dart';
 import 'package:sharedinbox/core/models/account.dart';
 import 'package:sharedinbox/core/models/email.dart';
@@ -12,16 +10,8 @@ import 'package:sharedinbox/core/repositories/mailbox_repository.dart';
 import 'package:sharedinbox/core/repositories/sync_log_repository.dart';
 import 'package:sharedinbox/core/sync/account_sync_manager.dart';
 
-Future<imap.ImapClient> _fakeImapConnect(
-  Account account,
-  String username,
-  String password,
-) async =>
-    throw const SocketException('fake — no real IMAP server in tests');
-
 void main() {
-  test('AccountSyncManager schedules IMAP sync for multiple accounts',
-      () async {
+  test('AccountSyncManager schedules sync for multiple accounts', () async {
     final accounts = _FakeAccounts('pw');
     final mailboxes = _FakeMailboxes();
     final emails = _FakeEmails();
@@ -32,7 +22,6 @@ void main() {
       mailboxes,
       emails,
       syncLog: logs,
-      imapConnect: _fakeImapConnect,
     );
 
     final a1 = _account('1');
@@ -49,34 +38,6 @@ void main() {
 
     manager.dispose();
   });
-
-  test('AccountSyncManager schedules JMAP sync for multiple accounts',
-      () async {
-    final accounts = _FakeAccounts('pw');
-    final mailboxes = _FakeMailboxes();
-    final emails = _FakeEmails();
-    final logs = _FakeLogs();
-
-    final manager = AccountSyncManager(
-      accounts,
-      mailboxes,
-      emails,
-      syncLog: logs,
-    );
-
-    final a1 = _jmapAccount('1');
-    final a2 = _jmapAccount('2');
-
-    manager.start();
-    accounts.push([a1, a2]);
-
-    await Future<void>.delayed(const Duration(milliseconds: 100));
-
-    expect(emails.syncCounts['1'], greaterThanOrEqualTo(1));
-    expect(emails.syncCounts['2'], greaterThanOrEqualTo(1));
-
-    manager.dispose();
-  });
 }
 
 Account _account(String id) => Account(
@@ -91,17 +52,6 @@ Account _account(String id) => Account(
       smtpSsl: false,
     );
 
-Account _jmapAccount(String id) => Account(
-      id: id,
-      displayName: 'Account $id',
-      email: '$id@example.com',
-      type: AccountType.jmap,
-      jmapUrl: 'http://localhost:8080/.well-known/jmap',
-      smtpHost: 'localhost',
-      smtpPort: 25,
-      smtpSsl: false,
-    );
-
 class _FakeAccounts implements AccountRepository {
   _FakeAccounts(this.password);
   final String password;

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, 27);
+      expect(db.schemaVersion, 26);
       await db.close();
     });
 
@@ -171,11 +171,6 @@ void main() {
       // Verify FTS table was created and is queryable.
       await db.customSelect('SELECT count(*) FROM email_fts').get();
 
-      // v27: search_history_entries table.
-      await db
-          .customSelect('SELECT count(*) FROM search_history_entries')
-          .get();
-
       await db.close();
       if (dbFile.existsSync()) dbFile.deleteSync();
     });
@@ -306,16 +301,11 @@ void main() {
       );
       await db.customSelect('SELECT count(*) FROM email_fts').get();
 
-      // v27: search_history_entries table.
-      await db
-          .customSelect('SELECT count(*) FROM search_history_entries')
-          .get();
-
       await db.close();
       if (dbFile.existsSync()) dbFile.deleteSync();
     });
 
-    test('fresh install creates all tables at schemaVersion 27', () async {
+    test('fresh install creates all tables at schemaVersion 26', () async {
       final db = AppDatabase(NativeDatabase.memory());
       await db.select(db.accounts).get();
 
@@ -338,7 +328,6 @@ void main() {
           'threads',
           'sync_health',
           'undo_actions',
-          'search_history_entries',
         ]),
       );
 

test/widget/account_list_screen_test.dart

@@ -5,7 +5,7 @@ import 'helpers.dart';
 
 void main() {
   group('AccountListScreen', () {
-    testWidgets('shows onboarding walkthrough when repository is empty', (
+    testWidgets('shows "No accounts yet." when repository is empty', (
       tester,
     ) async {
       await tester.pumpWidget(
@@ -13,7 +13,7 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      expect(find.text('Welcome to SharedInbox'), findsOneWidget);
+      expect(find.text('No accounts yet.'), findsOneWidget);
       expect(find.text('Add account'), findsOneWidget);
     });
 

test/widget/add_account_screen_test.dart

@@ -203,7 +203,7 @@ void main() {
       await tester.tap(find.text('Save'));
       await tester.pumpAndSettle();
 
-      expect(find.text('Welcome to SharedInbox'), findsOneWidget);
+      expect(find.text('No accounts yet.'), findsOneWidget);
     });
 
     testWidgets('JMAP connection failure shows error message', (tester) async {
@@ -284,7 +284,7 @@ void main() {
       await tester.tap(find.text('Save'));
       await tester.pumpAndSettle();
 
-      expect(find.text('Welcome to SharedInbox'), findsOneWidget);
+      expect(find.text('No accounts yet.'), findsOneWidget);
     });
 
     testWidgets(

test/widget/email_list_screen_golden_test.dart

@@ -1,158 +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/email.dart';
-import 'package:sharedinbox/di.dart';
-
-import 'helpers.dart';
-
-// Fixed-date emails so golden files don't change day to day.
-final _kDate = DateTime(2024, 6);
-
-Email _email({
-  String id = 'acc-1:1',
-  String subject = 'Hello world',
-  bool isSeen = true,
-  bool isFlagged = false,
-}) =>
-    Email(
-      id: id,
-      accountId: 'acc-1',
-      mailboxPath: 'INBOX',
-      uid: int.parse(id.split(':').last),
-      subject: subject,
-      receivedAt: _kDate,
-      sentAt: _kDate,
-      from: const [EmailAddress(name: 'Bob', email: 'bob@example.com')],
-      to: const [EmailAddress(email: 'alice@example.com')],
-      cc: const [],
-      isSeen: isSeen,
-      isFlagged: isFlagged,
-      hasAttachment: false,
-    );
-
-List<Override> _overrides({
-  List<Email> emails = const [],
-  List<Email> searchResults = const [],
-  String? syncError,
-}) =>
-    [
-      accountRepositoryProvider.overrideWithValue(
-        FakeAccountRepository([kTestAccount]),
-      ),
-      mailboxRepositoryProvider.overrideWithValue(
-        FakeMailboxRepository([kTestMailbox]),
-      ),
-      emailRepositoryProvider.overrideWithValue(
-        FakeEmailRepository(emails: emails, searchResults: searchResults),
-      ),
-      draftRepositoryProvider.overrideWithValue(FakeDraftRepository()),
-      searchHistoryRepositoryProvider.overrideWithValue(
-        FakeSearchHistoryRepository(),
-      ),
-      syncLastErrorProvider.overrideWith(
-        (ref, _) => Stream.value(syncError),
-      ),
-    ];
-
-void main() {
-  group('EmailListScreen goldens', () {
-    testWidgets('golden: empty state', (tester) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails',
-          overrides: _overrides(),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await expectLater(
-        find.byType(MaterialApp),
-        matchesGoldenFile('goldens/email_list_empty.png'),
-      );
-    });
-
-    testWidgets('golden: list with emails', (tester) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails',
-          overrides: _overrides(
-            emails: [
-              _email(subject: 'Team standup notes', isSeen: false),
-              _email(id: 'acc-1:2', subject: 'Q3 review', isFlagged: true),
-              _email(id: 'acc-1:3', subject: 'Welcome to the project'),
-            ],
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await expectLater(
-        find.byType(MaterialApp),
-        matchesGoldenFile('goldens/email_list_with_emails.png'),
-      );
-    });
-
-    testWidgets('golden: selection mode', (tester) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails',
-          overrides: _overrides(
-            emails: [
-              _email(subject: 'Team standup notes', isSeen: false),
-              _email(id: 'acc-1:2', subject: 'Q3 review'),
-            ],
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.longPress(find.text('Team standup notes'));
-      await tester.pumpAndSettle();
-
-      await expectLater(
-        find.byType(MaterialApp),
-        matchesGoldenFile('goldens/email_list_selection.png'),
-      );
-    });
-
-    testWidgets('golden: search with results', (tester) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails',
-          overrides: _overrides(
-            searchResults: [
-              _email(id: 'acc-1:5', subject: 'Project proposal'),
-            ],
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.enterText(find.byType(SearchBar), 'project');
-      await tester.testTextInput.receiveAction(TextInputAction.search);
-      await tester.pumpAndSettle();
-
-      await expectLater(
-        find.byType(MaterialApp),
-        matchesGoldenFile('goldens/email_list_search_results.png'),
-      );
-    });
-
-    testWidgets('golden: error banner', (tester) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails',
-          overrides: _overrides(syncError: 'Connection refused'),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await expectLater(
-        find.byType(MaterialApp),
-        matchesGoldenFile('goldens/email_list_error_banner.png'),
-      );
-    });
-  });
-}

test/widget/helpers.dart

@@ -17,7 +17,6 @@ import 'package:sharedinbox/core/repositories/account_repository.dart';
 import 'package:sharedinbox/core/repositories/draft_repository.dart';
 import 'package:sharedinbox/core/repositories/email_repository.dart';
 import 'package:sharedinbox/core/repositories/mailbox_repository.dart';
-import 'package:sharedinbox/core/repositories/search_history_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';
@@ -511,20 +510,3 @@ Email testEmail({
       isFlagged: isFlagged,
       hasAttachment: hasAttachment,
     );
-
-class FakeSearchHistoryRepository implements SearchHistoryRepository {
-  final List<String> _history = [];
-
-  @override
-  Future<List<String>> getRecentSearches() async => List.unmodifiable(_history);
-
-  @override
-  Future<void> saveSearch(String query) async {
-    _history.remove(query);
-    _history.insert(0, query);
-    if (_history.length > 10) _history.removeLast();
-  }
-
-  @override
-  Future<void> clearHistory() async => _history.clear();
-}

test/widget/search_screen_test.dart

@@ -20,9 +20,6 @@ void main() {
               FakeMailboxRepository(),
             ),
             emailRepositoryProvider.overrideWithValue(FakeEmailRepository()),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -45,9 +42,6 @@ void main() {
               FakeMailboxRepository(),
             ),
             emailRepositoryProvider.overrideWithValue(FakeEmailRepository()),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -74,9 +68,6 @@ void main() {
               FakeMailboxRepository(),
             ),
             emailRepositoryProvider.overrideWithValue(FakeEmailRepository()),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -106,9 +97,6 @@ void main() {
             emailRepositoryProvider.overrideWithValue(
               FakeEmailRepository(searchResults: [email]),
             ),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -144,9 +132,6 @@ void main() {
               FakeMailboxRepository([archiveMailbox]),
             ),
             emailRepositoryProvider.overrideWithValue(FakeEmailRepository()),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -177,9 +162,6 @@ void main() {
             emailRepositoryProvider.overrideWithValue(
               FakeEmailRepository(searchResults: [email]),
             ),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -193,9 +175,8 @@ void main() {
       await tester.tap(find.byIcon(Icons.clear));
       await tester.pumpAndSettle();
 
-      // Results are gone; the recent-search chip for the prior query appears.
       expect(find.text('Found email'), findsNothing);
-      expect(find.text('found'), findsOneWidget);
+      expect(find.text('Type 3+ characters to search'), findsOneWidget);
     });
   });
 }