Merge pull request #2692 from SatoshiPortal/merge/main-into-develop

backport main changes

Author: ethicnology

AGENTS.md

@@ -31,6 +31,13 @@ Bull Bitcoin Mobile: self-custodial Bitcoin + Liquid + Lightning wallet. Flutter
 - **`fvm dart fix --dry-run` must print `Nothing to fix!`** before commit. If not, run `fvm dart fix --apply` and stage the result.
 - **Pre-commit hook is the floor.** It runs analyze + dart fix dry-run ([`.git_hooks/pre-commit`](.git_hooks/pre-commit)). **Never `--no-verify`.** If it fails, fix the cause.
 
+## Database schema migration support
+
+- Every database schema version shipped in a published release is immutable and must remain a supported upgrade source through the migration chain; `main` generally archives that published truth.
+- Before the next release, `develop` keeps exactly one pending schema revision: the latest published schema plus 1. Aggregate all unreleased schema changes into that same next migration and snapshot; never bump once per feature or commit.
+- Intermediate schema states that existed only in `develop` are not compatibility targets. Development installs may require a reset or reinstall; do not add production migration guards or preserve intermediate snapshots solely for them.
+- Before release, verify the path from the latest published `main` schema fixture to the final pending schema. Once shipped, that migration and snapshot become immutable.
+
 ## Monorepo / melos
 
 The repo is migrating incrementally to a [melos](https://melos.invertase.dev/) pub-workspace. The Flutter app remains at the repo root through `useRootAsPackage: true`; current members are the `bull_ui` design system, its dev-only catalogue, the pure-Dart `primitives` package, the pure-Dart `bull_payjoin` package, and the Flutter `bull_tor` package. The makefile remains the canonical entry point across the workspace.

lib/core/primitives/payment_network.dart

@@ -0,0 +1,4 @@
+/// The network a payment moves through: on-chain Bitcoin, Lightning, or
+/// Liquid. Shared across features (e.g. `swap`, `dca`) that need to name a
+/// network without depending on each other's internal types.
+enum PaymentNetwork { bitcoin, lightning, liquid }

lib/core/primitives/payment_network_l10n.dart

@@ -0,0 +1,12 @@
+import 'package:bb_mobile/core/primitives/payment_network.dart';
+import 'package:bb_mobile/core/utils/build_context_x.dart';
+import 'package:flutter/widgets.dart';
+
+/// Kept in its own file so [PaymentNetwork] itself stays Flutter-free.
+extension PaymentNetworkL10n on PaymentNetwork {
+  String toTranslated(BuildContext context) => switch (this) {
+    PaymentNetwork.bitcoin => context.loc.transactionNetworkBitcoin,
+    PaymentNetwork.lightning => context.loc.transactionNetworkLightning,
+    PaymentNetwork.liquid => context.loc.transactionNetworkLiquid,
+  };
+}

lib/core/storage/migrations/schema_13_to_14.dart

@@ -8,11 +8,11 @@ import 'package:drift/drift.dart';
 /// - Records which home announcements the user has dismissed (announcement id
 ///   + dismissal timestamp). New table, created empty.
 ///
-/// During development, schema 14 briefly carried the Payjoin policy columns on
-/// `settings` and an `is_aborted` flag on the payjoin tables. Payjoin now owns
-/// its own database (payjoin.sqlite, see the bull_payjoin package), so those
-/// columns were folded out before schema 14 shipped in v6.13.0 rather than
-/// added and then migrated away.
+/// Schema 14 also briefly carried the Payjoin policy columns on `settings` and
+/// an `is_aborted` flag on the payjoin tables. Payjoin now owns its own
+/// database (payjoin.sqlite, see the bull_payjoin package), and 14 was never
+/// released — every tag up to v6.12.5 ships schema 13 — so those columns were
+/// folded out of this step rather than added and then migrated away.
 ///
 /// Adds the order_swaps table and indexes for crash-safe Exchange transfers.
 /// The table includes the nullable quoted_amount_sat column used to validate
@@ -59,18 +59,6 @@ class Schema13To14 {
       () => m.createIndex(schema14.orderSwapsLocalPayinTxid),
       'order_swaps_local_payin_txid index',
     );
-
-    await _addColumnIfNotExists(
-      () => m.addColumn(schema14.settings, schema14.settings.torTransportMode),
-      'settings.tor_transport_mode column',
-    );
-    await _addColumnIfNotExists(
-      () => m.addColumn(
-        schema14.settings,
-        schema14.settings.lastSuccessfulTorTransport,
-      ),
-      'settings.last_successful_tor_transport column',
-    );
   }
 }
 
@@ -91,18 +79,3 @@ Future<void> _createIfNotExists(
     );
   }
 }
-
-Future<void> _addColumnIfNotExists(
-  Future<void> Function() addColumn,
-  String description,
-) async {
-  try {
-    await addColumn();
-  } catch (e) {
-    if (!e.toString().contains('duplicate column name')) rethrow;
-    log.warning(
-      'Schema13To14: $description already exists — skipping add',
-      error: e,
-    );
-  }
-}