merge #2497 review fixes, dedupe duplicated files

Author: i5hi

lib/features/announcements/announcements_locator.dart

@@ -6,8 +6,8 @@ import 'package:bb_mobile/core/wallet/domain/usecases/get_wallet_transactions_us
 import 'package:bb_mobile/core/wallet/domain/usecases/watch_finished_wallet_syncs_usecase.dart';
 import 'package:bb_mobile/features/announcements/data/announcement_dismissal_repository_impl.dart';
 import 'package:bb_mobile/features/announcements/data/datasources/announcement_dismissal_datasource.dart';
-import 'package:bb_mobile/features/announcements/domain/dismiss_announcement_usecase.dart';
-import 'package:bb_mobile/features/announcements/domain/get_visible_announcements_usecase.dart';
+import 'package:bb_mobile/features/announcements/domain/usecases/dismiss_announcement_usecase.dart';
+import 'package:bb_mobile/features/announcements/domain/usecases/get_visible_announcements_usecase.dart';
 import 'package:bb_mobile/features/announcements/domain/repositories/announcement_dismissal_repository.dart';
 import 'package:bb_mobile/features/announcements/presentation/announcements_cubit.dart';
 import 'package:get_it/get_it.dart';

lib/features/announcements/data/announcement_dismissal_repository_impl.dart

@@ -22,6 +22,7 @@ class AnnouncementDismissalRepositoryImpl
 
   @override
   Future<void> dismiss(AnnouncementId id) async {
-    await _datasource.upsert(id.name, DateTime.now());
+    // Persist in UTC, per the `dismissed_announcements.dismissedAt` contract.
+    await _datasource.upsert(id.name, DateTime.now().toUtc());
   }
 }

lib/features/announcements/domain/entities/announcement.dart

@@ -28,13 +28,11 @@ sealed class AnnouncementAction {
   const AnnouncementAction();
 }
 
-/// Navigate to a named GoRouter route (by route *name*, not path, to avoid
-/// coupling to another feature's path layout).
+/// Tapping the announcement navigates somewhere. The concrete destination is
+/// resolved in the ui layer (`ui/announcement_navigation.dart`) from the
+/// [Announcement]'s id, so `domain/` never imports another feature's router.
 final class NavigateAction extends AnnouncementAction {
-  final String routeName;
-
-  const NavigateAction(this.routeName)
-    : assert(routeName != '', 'routeName must not be empty');
+  const NavigateAction();
 }
 
 /// How re-display works after the user dismisses an announcement.
@@ -53,8 +51,15 @@ final class PermanentDismiss extends DismissPolicy {
 final class SnoozeDismiss extends DismissPolicy {
   final Duration interval;
 
-  SnoozeDismiss(this.interval)
-    : assert(interval.inMicroseconds > 0, 'snooze interval must be positive');
+  SnoozeDismiss(this.interval) {
+    if (interval.inMicroseconds <= 0) {
+      throw ArgumentError.value(
+        interval,
+        'interval',
+        'snooze interval must be positive',
+      );
+    }
+  }
 }
 
 /// A rich, self-validating announcement definition.
@@ -78,7 +83,11 @@ class Announcement {
     required this.tone,
     required this.action,
     required this.dismissPolicy,
-  }) : assert(priority >= 0, 'priority must be non-negative');
+  }) {
+    if (priority < 0) {
+      throw ArgumentError.value(priority, 'priority', 'must be non-negative');
+    }
+  }
 
   /// Whether a dismissal recorded at [dismissedAt] still suppresses this
   /// announcement as of [now]. Permanent dismissals always suppress; snooze

lib/features/announcements/domain/entities/announcement_catalog.dart

@@ -1,5 +1,4 @@
 import 'package:bb_mobile/features/announcements/domain/entities/announcement.dart';
-import 'package:bb_mobile/features/settings/ui/settings_router.dart';
 
 /// The runtime signals a trigger can read to decide whether it fires.
 ///
@@ -45,7 +44,7 @@ final List<AnnouncementCatalogEntry> announcementCatalog = [
       id: AnnouncementId.payjoinPrivacy,
       priority: 0,
       tone: AnnouncementTone.info,
-      action: NavigateAction(SettingsRoute.payjoinSettings.name),
+      action: const NavigateAction(),
       dismissPolicy: const PermanentDismiss(),
     ),
     // Show once the wallet has received/transacted (first UTXO or history after
@@ -57,7 +56,7 @@ final List<AnnouncementCatalogEntry> announcementCatalog = [
       id: AnnouncementId.autoswapActive,
       priority: 1,
       tone: AnnouncementTone.success,
-      action: NavigateAction(SettingsRoute.autoswapSettings.name),
+      action: const NavigateAction(),
       dismissPolicy: const PermanentDismiss(),
     ),
     // Show while autoswap is enabled, letting the user learn what it does.

…domain/dismiss_announcement_usecase.dart …ecases/dismiss_announcement_usecase.dartlib/features/announcements/domain/dismiss_announcement_usecase.dart renamed to lib/features/announcements/domain/usecases/dismiss_announcement_usecase.dart lib/features/announcements/domain/dismiss_announcement_usecase.dart renamed to lib/features/announcements/domain/usecases/dismiss_announcement_usecase.dart

@@ -30,10 +30,13 @@ class GetVisibleAnnouncementsUsecase {
 
   Future<Result<List<Announcement>, AnnouncementsFailure>> execute() async {
     try {
-      final settings = await _settingsRepository.fetch();
-      final transactions = await _getWalletTransactionsUsecase.execute();
-      final autoSwap = await _getAutoSwapSettingsUsecase.execute();
-      final dismissals = await _dismissalRepository.getDismissals();
+      // The four sources are independent, so gather them concurrently.
+      final (settings, transactions, autoSwap, dismissals) = await (
+        _settingsRepository.fetch(),
+        _getWalletTransactionsUsecase.execute(),
+        _getAutoSwapSettingsUsecase.execute(),
+        _dismissalRepository.getDismissals(),
+      ).wait;
 
       final signals = AnnouncementSignals(
         isPayjoinEnabled: settings.isPayjoinEnabled,
@@ -42,7 +45,7 @@ class GetVisibleAnnouncementsUsecase {
       );
 
       final dismissedAtById = {for (final d in dismissals) d.id: d.dismissedAt};
-      final now = DateTime.now();
+      final now = DateTime.now().toUtc();
 
       final visible = <Announcement>[];
       for (final entry in announcementCatalog) {
@@ -60,7 +63,9 @@ class GetVisibleAnnouncementsUsecase {
       visible.sort((a, b) => a.priority.compareTo(b.priority));
       return Ok(visible);
     } catch (e) {
-      return Err(AnnouncementStorageFailure(e.toString()));
+      // Sources span settings/tx/autoswap/storage, so this is a genuine
+      // catch-all rather than a storage-only failure.
+      return Err(AnnouncementUnexpectedFailure(e.toString()));
     }
   }
 }

…n/get_visible_announcements_usecase.dart …s/get_visible_announcements_usecase.dartlib/features/announcements/domain/get_visible_announcements_usecase.dart renamed to lib/features/announcements/domain/usecases/get_visible_announcements_usecase.dart lib/features/announcements/domain/get_visible_announcements_usecase.dart renamed to lib/features/announcements/domain/usecases/get_visible_announcements_usecase.dart

@@ -4,9 +4,9 @@ import 'package:bb_mobile/core/settings/domain/watch_payjoin_enabled_changes_use
 import 'package:bb_mobile/core/wallet/domain/entities/wallet.dart';
 import 'package:bb_mobile/core/wallet/domain/usecases/watch_finished_wallet_syncs_usecase.dart';
 import 'package:bb_mobile/features/announcements/domain/announcements_failure.dart';
-import 'package:bb_mobile/features/announcements/domain/dismiss_announcement_usecase.dart';
+import 'package:bb_mobile/features/announcements/domain/usecases/dismiss_announcement_usecase.dart';
 import 'package:bb_mobile/features/announcements/domain/entities/announcement.dart';
-import 'package:bb_mobile/features/announcements/domain/get_visible_announcements_usecase.dart';
+import 'package:bb_mobile/features/announcements/domain/usecases/get_visible_announcements_usecase.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
@@ -29,6 +29,9 @@ class AnnouncementsCubit extends Cubit<AnnouncementsState> {
   StreamSubscription<bool>? _payjoinEnabledSub;
   StreamSubscription<Wallet>? _walletSyncSub;
 
+  bool _refreshing = false;
+  bool _refreshQueued = false;
+
   AnnouncementsCubit({
     required this._getVisibleAnnouncementsUsecase,
     required this._dismissAnnouncementUsecase,
@@ -47,18 +50,37 @@ class AnnouncementsCubit extends Cubit<AnnouncementsState> {
 
   /// (Re)loads the visible announcements. Called on mount and whenever a
   /// trigger signal changes.
+  ///
+  /// Overlapping calls are coalesced: a request arriving while a load is in
+  /// flight re-runs once after it completes, so several wallets syncing
+  /// back-to-back can't spawn redundant, out-of-order loads.
   Future<void> refresh() async {
-    final result = await _getVisibleAnnouncementsUsecase.execute();
-    result.fold(
-      (announcements) => emit(AnnouncementsState(announcements: announcements)),
-      (failure) => emit(state.copyWith(failure: failure)),
-    );
+    if (_refreshing) {
+      _refreshQueued = true;
+      return;
+    }
+    _refreshing = true;
+    try {
+      do {
+        _refreshQueued = false;
+        final result = await _getVisibleAnnouncementsUsecase.execute();
+        if (isClosed) return;
+        result.fold(
+          (announcements) =>
+              emit(AnnouncementsState(announcements: announcements)),
+          (failure) => emit(state.copyWith(failure: failure)),
+        );
+      } while (_refreshQueued);
+    } finally {
+      _refreshing = false;
+    }
   }
 
   /// Records a dismissal and refreshes the list (which collapses the section
   /// when the last card is dismissed).
   Future<void> dismiss(AnnouncementId id) async {
     final result = await _dismissAnnouncementUsecase.execute(id);
+    if (isClosed) return;
     await result.fold(
       (_) => refresh(),
       (failure) async => emit(state.copyWith(failure: failure)),

lib/features/announcements/presentation/announcements_cubit.dart

@@ -0,0 +1,14 @@
+import 'package:bb_mobile/features/announcements/domain/entities/announcement.dart';
+import 'package:bb_mobile/features/settings/ui/settings_router.dart';
+
+/// Resolves each announcement to the route its [NavigateAction] opens.
+///
+/// Lives in the ui layer so `domain/` never imports another feature's router
+/// (AGENTS.md rule #1 + Flutter-free domain). The exhaustive `switch` over the
+/// closed [AnnouncementId] enum makes a missing mapping a compile-time warning.
+extension AnnouncementNavigation on Announcement {
+  SettingsRoute get route => switch (id) {
+    AnnouncementId.payjoinPrivacy => SettingsRoute.payjoinSettings,
+    AnnouncementId.autoswapActive => SettingsRoute.autoswapSettings,
+  };
+}

lib/features/announcements/ui/announcement_navigation.dart

@@ -1,5 +1,8 @@
+import 'package:bb_mobile/core/widgets/snackbar_utils.dart';
 import 'package:bb_mobile/features/announcements/domain/entities/announcement.dart';
 import 'package:bb_mobile/features/announcements/presentation/announcements_cubit.dart';
+import 'package:bb_mobile/features/announcements/presentation/announcements_failure_l10n.dart';
+import 'package:bb_mobile/features/announcements/ui/announcement_navigation.dart';
 import 'package:bb_mobile/features/announcements/ui/widgets/announcement_card.dart';
 import 'package:bb_mobile/features/announcements/ui/widgets/announcement_dismiss_dialog.dart';
 import 'package:bull_ui/bull_ui.dart';
@@ -16,26 +19,41 @@ class AnnouncementCarousel extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    // Narrow rebuild: only when the visible set changes.
-    return BlocSelector<
-      AnnouncementsCubit,
-      AnnouncementsState,
-      List<Announcement>
-    >(
-      selector: (state) => state.announcements,
-      builder: (context, announcements) {
-        return AnimatedSize(
-          duration: const Duration(milliseconds: 200),
-          curve: Curves.easeInOut,
-          alignment: Alignment.topCenter,
-          child: announcements.isEmpty
-              ? const SizedBox(width: double.infinity)
-              : Padding(
-                  padding: const EdgeInsets.only(left: 13, right: 13, top: 13),
-                  child: _CarouselBody(announcements: announcements),
-                ),
-        );
-      },
+    return BlocListener<AnnouncementsCubit, AnnouncementsState>(
+      // Surface a dismissal/refresh failure (the card otherwise just stays).
+      // Fires only when a new failure appears, not on every rebuild.
+      listenWhen: (previous, current) =>
+          current.failure != null && previous.failure != current.failure,
+      listener: (context, state) => SnackBarUtils.showSnackBar(
+        context,
+        state.failure!.toTranslated(context),
+      ),
+      // Narrow rebuild: only when the visible set changes.
+      child:
+          BlocSelector<
+            AnnouncementsCubit,
+            AnnouncementsState,
+            List<Announcement>
+          >(
+            selector: (state) => state.announcements,
+            builder: (context, announcements) {
+              return AnimatedSize(
+                duration: const Duration(milliseconds: 200),
+                curve: Curves.easeInOut,
+                alignment: Alignment.topCenter,
+                child: announcements.isEmpty
+                    ? const SizedBox(width: double.infinity)
+                    : Padding(
+                        padding: const EdgeInsets.only(
+                          left: 13,
+                          right: 13,
+                          top: 13,
+                        ),
+                        child: _CarouselBody(announcements: announcements),
+                      ),
+              );
+            },
+          ),
     );
   }
 }
@@ -72,8 +90,8 @@ class _CarouselBodyState extends State<_CarouselBody> {
 
   void _onTap(Announcement announcement) {
     switch (announcement.action) {
-      case NavigateAction(:final routeName):
-        context.pushNamed(routeName);
+      case NavigateAction():
+        context.pushNamed(announcement.route.name);
     }
   }
 

lib/features/announcements/ui/widgets/announcement_carousel.dart

@@ -79,8 +79,4 @@ sealed class WalletState with _$WalletState {
       liquidWallet.balanceSat.toInt(),
     );
   }
-
-  bool showAutoSwapActiveStatus() {
-    return autoSwapSettings != null && autoSwapSettings!.enabled;
-  }
 }