fix: address review findings - router guard, disclaimer ordering, bbswitch, dead code

Author: i5hi

lib/core/widgets/switch/bb_switch.dart

@@ -2,17 +2,27 @@ import 'package:bb_mobile/core/themes/app_theme.dart';
 import 'package:flutter/material.dart';
 
 class BBSwitch extends StatelessWidget {
-  const BBSwitch({super.key, required this.value, required this.onChanged});
+  const BBSwitch({
+    super.key,
+    required this.value,
+    required this.onChanged,
+    this.materialTapTargetSize,
+  });
 
   final bool value;
 
   /// Null renders the switch disabled.
   final ValueChanged<bool>? onChanged;
 
+  /// Pass [MaterialTapTargetSize.shrinkWrap] for dense placements (e.g.
+  /// single-line tiles).
+  final MaterialTapTargetSize? materialTapTargetSize;
+
   @override
   Widget build(BuildContext context) {
     return Switch(
       value: value,
+      materialTapTargetSize: materialTapTargetSize,
       activeThumbColor: context.appColors.onSecondary,
       activeTrackColor: context.appColors.secondary,
       inactiveThumbColor: context.appColors.border,

lib/features/receive/presentation/bloc/receive_bloc.dart

@@ -142,8 +142,11 @@ class ReceiveBloc extends Bloc<ReceiveEvent, ReceiveState> {
   /// contribute as an input. Unconfirmed counts: the contribution path draws
   /// from BDK's listUnspent (which includes unconfirmed outputs), so waiting
   /// for a confirmation only delays payjoin activation on fresh wallets;
-  /// worst case a strict sender rejects a proposal spending an unconfirmed
-  /// input and the payment falls back to a normal broadcast.
+  /// worst case is not just a strict sender rejecting the proposal (falling
+  /// back to a normal broadcast): a payjoin tx spending our unconfirmed
+  /// input can be invalidated by an RBF of that input's parent after both
+  /// sides consider the payment done. _filterAvailableUtxos preferring
+  /// confirmed UTXOs when available is the cheap mitigation.
   bool _isPayjoinEligible(Wallet wallet, bool payjoinEnabled) =>
       wallet.signsLocally && payjoinEnabled && wallet.balanceSat > BigInt.zero;
 
@@ -236,7 +239,7 @@ class ReceiveBloc extends Bloc<ReceiveEvent, ReceiveState> {
 
       // If the payjoin receiver is not set yet, we need to create it, but only
       //  if the wallet is eligible (see _isPayjoinEligible: not watch-only,
-      //  payjoin enabled globally, and a confirmed balance to contribute) —
+      //  payjoin enabled globally, and a balance to contribute) —
       //  when disabled the QR must never advertise a pj= endpoint, or the
       //  sender's wallet would attempt a payjoin nobody here will process.
       //

lib/features/receive/presentation/bloc/receive_state.dart

@@ -285,7 +285,7 @@ abstract class ReceiveState with _$ReceiveState {
       // would create the session.
       //
       // Also gated on [hasUtxos]: ReceiveBloc only creates a session for a
-      // wallet with a confirmed balance to contribute (see
+      // wallet with a balance to contribute (unconfirmed counts, see
       // ReceiveBloc._isPayjoinEligible — a payjoin proposal needs at least
       // one UTXO), so an empty wallet would otherwise hit the exact same
       // "stuck loading forever" bug as the disabled case.

lib/features/receive/ui/receive_router.dart

@@ -146,10 +146,12 @@ class ReceiveRouter {
           final wallet = state.extra is Wallet ? state.extra! as Wallet : null;
           // Same guard as the lightning and liquid routes: this pageBuilder
           // re-runs when popping back from the child amount route, and an
-          // unconditional restart wipes the confirmed amount, message and
-          // label the user just entered there.
-          if (bloc.state.type != ReceiveType.bitcoin ||
-              (wallet != null && bloc.state.wallet?.id != wallet.id)) {
+          // unconditional restart wipes the confirmed amount and message the
+          // user just entered there. Type mismatch only — comparing the
+          // route-extra wallet would revert an in-flow dropdown switch on
+          // pop-back (the extra still holds the wallet the flow was entered
+          // with), and a fresh entry always has a null type anyway.
+          if (bloc.state.type != ReceiveType.bitcoin) {
             bloc.add(ReceiveBitcoinStarted(wallet));
           }
           return NoTransitionPage(child: ReceiveQrPage(wallet: wallet));

lib/features/receive/ui/screens/receive_qr_screen.dart

@@ -61,7 +61,7 @@ class ReceiveQrPage extends StatelessWidget {
           // Half-gaps below the address block: matches the address→payjoin
           // spacing inside ReceiveQRDetails so the stack reads evenly.
           Gap(gap / 2),
-          ReceiveInfoDetails(wallet: wallet),
+          const ReceiveInfoDetails(),
           Gap(gap / 2),
           if (showAddressVerification) ...[
             if (isLedger)
@@ -235,9 +235,7 @@ class ReceiveQRDetails extends StatelessWidget {
 }
 
 class ReceiveInfoDetails extends StatelessWidget {
-  const ReceiveInfoDetails({super.key, this.wallet});
-
-  final Wallet? wallet;
+  const ReceiveInfoDetails({super.key});
 
   /// Suffix showing the unit the user entered in, when it wasn't BTC:
   /// sats → " (N sats)", fiat → " (~X CUR)". Entered-in-BTC shows nothing —

lib/features/receive/ui/widgets/receive_payjoin_toggle_button.dart

@@ -1,3 +1,4 @@
+import 'package:bb_mobile/core/widgets/switch/bb_switch.dart';
 import 'package:bb_mobile/core/themes/app_theme.dart';
 import 'package:bb_mobile/core/utils/build_context_x.dart';
 import 'package:bb_mobile/core/widgets/text/text.dart';
@@ -56,7 +57,7 @@ class ReceivePayjoinToggleTile extends StatelessWidget {
                 color: context.appColors.secondary,
               ),
             ),
-            Switch(
+            BBSwitch(
               value: enabled,
               materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
               onChanged: (value) {

lib/features/settings/ui/widgets/payjoin_disclaimer_dialog.dart

@@ -22,9 +22,12 @@ abstract final class PayjoinDisclaimerDialog {
   static Future<void> showIfNeverShown(BuildContext context) async {
     final datasource = locator<PayjoinDisclaimerDatasource>();
     if (await datasource.readDisclaimerShown()) return;
-    await datasource.writeDisclaimerShown();
+    // Mark shown only once the dialog was actually displayed — writing
+    // first would permanently skip the one-time disclosure if the context
+    // is unmounted by the time the async read resolves.
     if (!context.mounted) return;
     await show(context);
+    await datasource.writeDisclaimerShown();
   }
 }
 

localization/app_en.arb

@@ -1660,10 +1660,6 @@
   "@receiveFeeExplanation": {
     "description": "Explanation that fees are deducted from the sent amount"
   },
-  "receiveNotePlaceholder": "Note",
-  "@receiveNotePlaceholder": {
-    "description": "Placeholder text for note input field"
-  },
   "receiveReceiveAmount": "Receive Amount",
   "@receiveReceiveAmount": {
     "description": "Label for the amount that will be received after fees"
@@ -14929,10 +14925,6 @@
   "@sendPayjoinLabel": {
     "description": "Row title on the send confirmation details showing (with a tick) that this send will attempt a payjoin."
   },
-  "sendPayjoinWillBeAttempted": "A payjoin will be attempted for this payment.",
-  "@sendPayjoinWillBeAttempted": {
-    "description": "Confirm-screen indicator shown when a payjoin will be attempted for the send."
-  },
   "sendSentWithoutPayjoin": "Sent without Payjoin: the recipient did not complete the Payjoin, so a standard transaction was broadcast instead.",
   "@sendSentWithoutPayjoin": {
     "description": "Success-screen notice when a payjoin send fell back to a plain broadcast."