fix: remove autoswap from announcements, home surface stays the warning card

Author: i5hi

lib/features/announcements/announcements_locator.dart

@@ -1,8 +1,4 @@
 import 'package:bb_mobile/core/storage/sqlite_database.dart';
-import 'package:bb_mobile/core/swaps/domain/usecases/get_auto_swap_settings_usecase.dart';
-import 'package:bb_mobile/core/swaps/domain/usecases/watch_auto_swap_settings_usecase.dart';
-import 'package:bb_mobile/core/wallet/domain/usecases/get_wallets_usecase.dart';
-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/usecases/dismiss_announcement_usecase.dart';
@@ -26,8 +22,6 @@ class AnnouncementsLocator {
     // Use-cases
     locator.registerFactory<GetVisibleAnnouncementsUsecase>(
       () => GetVisibleAnnouncementsUsecase(
-        getWalletsUsecase: locator<GetWalletsUsecase>(),
-        getAutoSwapSettingsUsecase: locator<GetAutoSwapSettingsUsecase>(),
         dismissalRepository: locator<AnnouncementDismissalRepository>(),
       ),
     );
@@ -43,9 +37,6 @@ class AnnouncementsLocator {
         getVisibleAnnouncementsUsecase:
             locator<GetVisibleAnnouncementsUsecase>(),
         dismissAnnouncementUsecase: locator<DismissAnnouncementUsecase>(),
-        watchFinishedWalletSyncsUsecase:
-            locator<WatchFinishedWalletSyncsUsecase>(),
-        watchAutoSwapSettingsUsecase: locator<WatchAutoSwapSettingsUsecase>(),
       ),
     );
   }

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

@@ -5,13 +5,7 @@ import 'package:bb_mobile/features/announcements/domain/entities/announcement.da
 /// Extend this (and the gathering in `GetVisibleAnnouncementsUsecase`) as new
 /// announcements need new signals.
 class AnnouncementSignals {
-  /// Whether autoswap is enabled AND the Liquid balance has actually reached
-  /// its trigger threshold (`AutoSwap.passedRequiredBalance`) — the card
-  /// informs about an imminent/behaving swap, so a balance that can't
-  /// trigger one shouldn't surface it (product decision 2026-07-25).
-  final bool isAutoswapTriggerable;
-
-  const AnnouncementSignals({required this.isAutoswapTriggerable});
+  const AnnouncementSignals();
 }
 
 /// A catalog entry: an [Announcement] definition paired with the predicate that
@@ -37,21 +31,11 @@ class AnnouncementCatalogEntry {
 /// entry here with its trigger, and add the title/description l10n mapping in
 /// `presentation/announcement_l10n.dart`.
 ///
-/// The payjoin-privacy nudge was removed on purpose (product decision
-/// 2026-07-25): payjoin education lives in the enable-time disclaimer and the
-/// payjoin settings screen, not on home. Its [AnnouncementId] value stays so
-/// persisted dismissals of it keep mapping cleanly.
-final List<AnnouncementCatalogEntry> announcementCatalog = [
-  AnnouncementCatalogEntry(
-    announcement: Announcement(
-      id: AnnouncementId.autoswapActive,
-      priority: 0,
-      tone: AnnouncementTone.success,
-      action: const NavigateAction(),
-      dismissPolicy: const PermanentDismiss(),
-    ),
-    // Show while autoswap is enabled AND the balance can actually trigger a
-    // swap, letting the user learn what is about to happen to their funds.
-    trigger: (s) => s.isAutoswapTriggerable,
-  ),
-];
+/// Currently EMPTY on purpose. The payjoin-privacy nudge was removed
+/// (product decision 2026-07-25): payjoin education lives in the enable-time
+/// disclaimer and the payjoin settings screen, not on home. The autoswap
+/// card was removed too (product decision 2026-07-28): autoswap's home
+/// surface is the pre-existing AutoSwapWarningCard driven by WalletBloc, as
+/// in the last release — not an announcement. Both [AnnouncementId] values
+/// stay so persisted dismissals keep mapping cleanly.
+final List<AnnouncementCatalogEntry> announcementCatalog = [];

lib/features/announcements/domain/usecases/get_visible_announcements_usecase.dart

@@ -1,48 +1,28 @@
-import 'package:bb_mobile/core/swaps/domain/usecases/get_auto_swap_settings_usecase.dart';
 import 'package:bb_mobile/core/utils/result.dart';
-import 'package:bb_mobile/core/wallet/domain/usecases/get_wallets_usecase.dart';
 import 'package:bb_mobile/features/announcements/domain/announcements_failure.dart';
 import 'package:bb_mobile/features/announcements/domain/entities/announcement.dart';
 import 'package:bb_mobile/features/announcements/domain/entities/announcement_catalog.dart';
 import 'package:bb_mobile/features/announcements/domain/repositories/announcement_dismissal_repository.dart';
 
 /// Orchestrates which announcements are currently visible on the home carousel.
 ///
-/// Thin orchestration only: it gathers the trigger signals (autoswap settings
-/// and the Liquid balance they apply to), asks each catalog entry whether its
-/// trigger fires, drops anything the user has dismissed (respecting the
-/// per-announcement dismiss policy), and returns the survivors ordered by
-/// ascending priority. All decision *rules* live on the entities / catalog;
-/// this use-case only wires signals to them.
+/// Thin orchestration only: it asks each catalog entry whether its trigger
+/// fires for the current [AnnouncementSignals], drops anything the user has
+/// dismissed (respecting the per-announcement dismiss policy), and returns
+/// the survivors ordered by ascending priority. All decision *rules* live on
+/// the entities / catalog; this use-case only wires signals to them. (The
+/// catalog is currently empty — see its doc comment — so this returns an
+/// empty list until a future announcement is added.)
 class GetVisibleAnnouncementsUsecase {
-  final GetWalletsUsecase _getWalletsUsecase;
-  final GetAutoSwapSettingsUsecase _getAutoSwapSettingsUsecase;
   final AnnouncementDismissalRepository _dismissalRepository;
 
-  GetVisibleAnnouncementsUsecase({
-    required this._getWalletsUsecase,
-    required this._getAutoSwapSettingsUsecase,
-    required this._dismissalRepository,
-  });
+  GetVisibleAnnouncementsUsecase({required this._dismissalRepository});
 
   Future<Result<List<Announcement>, AnnouncementsFailure>> execute() async {
     try {
-      // The three sources are independent, so gather them concurrently.
-      final (liquidBalanceSat, autoSwap, dismissals) = await (
-        _defaultLiquidBalanceSat(),
-        _getAutoSwapSettingsUsecase.execute(),
-        _dismissalRepository.getDismissals(),
-      ).wait;
-
-      // Autoswap sweeps the default Liquid wallet, so its balance is what
-      // the trigger threshold applies to. The threshold rule itself lives on
-      // the AutoSwap entity (passedRequiredBalance also checks `enabled`).
-      final signals = AnnouncementSignals(
-        isAutoswapTriggerable:
-            !autoSwap.showWarning &&
-            autoSwap.passedRequiredBalance(liquidBalanceSat.toInt()),
-      );
+      final dismissals = await _dismissalRepository.getDismissals();
 
+      const signals = AnnouncementSignals();
       final dismissedAtById = {for (final d in dismissals) d.id: d.dismissedAt};
       final now = DateTime.now().toUtc();
 
@@ -62,29 +42,7 @@ class GetVisibleAnnouncementsUsecase {
       visible.sort((a, b) => a.priority.compareTo(b.priority));
       return Ok(visible);
     } catch (e) {
-      // Sources span wallets/autoswap/storage, so this is a genuine
-      // catch-all rather than a storage-only failure.
       return Err(AnnouncementUnexpectedFailure(e.toString()));
     }
   }
-
-  /// Balance of the default Liquid wallet(s) of the current environment, or
-  /// zero when there is none.
-  ///
-  /// [GetWalletsUsecase] throws [NoWalletsFoundException] on an empty result,
-  /// which would turn a perfectly ordinary state ("this environment has no
-  /// default liquid wallet yet") into an `Err`, i.e. an error snackbar on the
-  /// home screen, re-fired on every wallet sync. No wallet means no balance,
-  /// which is a signal value, not a failure.
-  Future<BigInt> _defaultLiquidBalanceSat() async {
-    try {
-      final wallets = await _getWalletsUsecase.execute(
-        onlyLiquid: true,
-        onlyDefaults: true,
-      );
-      return wallets.fold<BigInt>(BigInt.zero, (sum, w) => sum + w.balanceSat);
-    } on NoWalletsFoundException {
-      return BigInt.zero;
-    }
-  }
 }

lib/features/announcements/presentation/announcements_cubit.dart

@@ -1,9 +1,3 @@
-import 'dart:async';
-
-import 'package:bb_mobile/core/wallet/domain/entities/wallet.dart';
-import 'package:bb_mobile/core/swaps/domain/entity/auto_swap.dart';
-import 'package:bb_mobile/core/swaps/domain/usecases/watch_auto_swap_settings_usecase.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/usecases/dismiss_announcement_usecase.dart';
 import 'package:bb_mobile/features/announcements/domain/entities/announcement.dart';
@@ -23,30 +17,19 @@ part 'announcements_state.dart';
 class AnnouncementsCubit extends Cubit<AnnouncementsState> {
   final GetVisibleAnnouncementsUsecase _getVisibleAnnouncementsUsecase;
   final DismissAnnouncementUsecase _dismissAnnouncementUsecase;
-  final WatchFinishedWalletSyncsUsecase _watchFinishedWalletSyncsUsecase;
-  final WatchAutoSwapSettingsUsecase _watchAutoSwapSettingsUsecase;
-
-  StreamSubscription<Wallet>? _walletSyncSub;
-  StreamSubscription<AutoSwap>? _autoSwapSettingsSub;
 
   bool _refreshing = false;
   bool _refreshQueued = false;
 
+  // No signal subscriptions: the catalog is currently empty, and its only
+  // past signals (autoswap balance/settings) left with the autoswap card —
+  // autoswap's home surface is AutoSwapWarningCard, not an announcement.
+  // When a future announcement adds a signal, re-add the matching watch
+  // here (see git history for the wallet-sync + autoswap-settings pair).
   AnnouncementsCubit({
     required this._getVisibleAnnouncementsUsecase,
     required this._dismissAnnouncementUsecase,
-    required this._watchFinishedWalletSyncsUsecase,
-    required this._watchAutoSwapSettingsUsecase,
-  }) : super(const AnnouncementsState()) {
-    // Re-evaluate after each wallet sync: the Liquid balance (the autoswap
-    // trigger signal) only moves when a sync lands.
-    _walletSyncSub = _watchFinishedWalletSyncsUsecase.execute().listen(
-      (_) => refresh(),
-    );
-    _autoSwapSettingsSub = _watchAutoSwapSettingsUsecase.execute().listen(
-      (_) => refresh(),
-    );
-  }
+  }) : super(const AnnouncementsState());
 
   /// (Re)loads the visible announcements. Called on mount and whenever a
   /// trigger signal changes.
@@ -86,11 +69,4 @@ class AnnouncementsCubit extends Cubit<AnnouncementsState> {
       (failure) async => emit(state.copyWith(failure: failure)),
     );
   }
-
-  @override
-  Future<void> close() {
-    _walletSyncSub?.cancel();
-    _autoSwapSettingsSub?.cancel();
-    return super.close();
-  }
 }