little enhancements :))

sadespresso · sadespresso · commit d89ed4909309 · 2025-12-30T17:51:41.000+08:00
diff --git a/assets/l10n/ar.json b/assets/l10n/ar.json
@@ -676,7 +676,6 @@
   "transactions.batch.import.success": "تم استيراد {n} من المعاملات بنجاح",
   "transactions.batch.importN": "استيراد {n} من المعاملات",
   "transactions.batch.review": "يرجى مراجعة المعاملات",
-  "transactions.batch.selectAccount": "اختر حسابًا",
   "transactions.count": "{} معاملة",
   "transactions.pending": "المعاملات المعلقة",
   "transactions.query.clearAll": "مسح الفلاتر",
diff --git a/assets/l10n/cs_CZ.json b/assets/l10n/cs_CZ.json
@@ -676,7 +676,6 @@
   "transactions.batch.import.success": "Úspěšně importováno {n} transakcí",
   "transactions.batch.importN": "Importovat {n} transakcí",
   "transactions.batch.review": "Prosím zkontrolujte transakce",
-  "transactions.batch.selectAccount": "Vybrat účet",
   "transactions.count": "{count} transakcí",
   "transactions.pending": "Čekající transakce",
   "transactions.query.clearAll": "Vymazat filtry",
diff --git a/assets/l10n/de_DE.json b/assets/l10n/de_DE.json
@@ -676,7 +676,6 @@
   "transactions.batch.import.success": "Erfolgreich {n} Transaktionen importiert",
   "transactions.batch.importN": "{n} Transaktionen importieren",
   "transactions.batch.review": "Bitte überprüfen Sie die Transaktionen",
-  "transactions.batch.selectAccount": "Konto auswählen",
   "transactions.count": "{} Buchungen",
   "transactions.pending": "Ausstehende Buchungen",
   "transactions.query.clearAll": "Filter löschen",
diff --git a/assets/l10n/en.json b/assets/l10n/en.json
@@ -676,7 +676,6 @@
   "transactions.batch.import.success": "Successfully imported {n} transactions",
   "transactions.batch.importN": "Import {n} transactions",
   "transactions.batch.review": "Please review the transactions",
-  "transactions.batch.selectAccount": "Select account",
   "transactions.count": "{} transactions",
   "transactions.pending": "Pending transactions",
   "transactions.query.clearAll": "Clear filters",
diff --git a/assets/l10n/es_ES.json b/assets/l10n/es_ES.json
@@ -676,7 +676,6 @@
   "transactions.batch.import.success": "Se han importado correctamente {n} transacciones",
   "transactions.batch.importN": "Importar {n} transacciones",
   "transactions.batch.review": "Por favor, revise las transacciones",
-  "transactions.batch.selectAccount": "Seleccionar cuenta",
   "transactions.count": "{} transacciones",
   "transactions.pending": "Transacciones pendientes",
   "transactions.query.clearAll": "Borrar filtros",
diff --git a/assets/l10n/fr_FR.json b/assets/l10n/fr_FR.json
@@ -676,7 +676,6 @@
   "transactions.batch.import.success": "{n} transactions importées avec succès",
   "transactions.batch.importN": "Importer {n} transactions",
   "transactions.batch.review": "Veuillez vérifier les transactions",
-  "transactions.batch.selectAccount": "Sélectionner un compte",
   "transactions.count": "{} transactions",
   "transactions.pending": "Transactions en attente",
   "transactions.query.clearAll": "Effacer les filtres",
diff --git a/assets/l10n/it_IT.json b/assets/l10n/it_IT.json
@@ -676,7 +676,6 @@
   "transactions.batch.import.success": "Importate con successo {n} transazioni",
   "transactions.batch.importN": "Importa {n} transazioni",
   "transactions.batch.review": "Rivedi le transazioni",
-  "transactions.batch.selectAccount": "Seleziona un account",
   "transactions.count": "{count} transazioni",
   "transactions.pending": "Transazioni in sospeso",
   "transactions.query.clearAll": "Cancella filtri",
diff --git a/assets/l10n/mn_MN.json b/assets/l10n/mn_MN.json
@@ -676,7 +676,6 @@
   "transactions.batch.import.success": "{n} гүйлгээ амжилттай нэмлээ",
   "transactions.batch.importN": "{n} гүйлгээ нэмэх",
   "transactions.batch.review": "Гүйлгээнүүдийг хянана уу",
-  "transactions.batch.selectAccount": "Данс сонгох",
   "transactions.count": "{} гүйлгээ",
   "transactions.pending": "Хүлээгдэж буй гүйлгээнүүд",
   "transactions.query.clearAll": "Шүүлтүүрийг цэвэрлэх",
diff --git a/assets/l10n/ru_RU.json b/assets/l10n/ru_RU.json
@@ -676,7 +676,6 @@
   "transactions.batch.import.success": "Успешно импортировано {n} транзакций",
   "transactions.batch.importN": "Импортировать {n} транзакций",
   "transactions.batch.review": "Пожалуйста, проверьте транзакции",
-  "transactions.batch.selectAccount": "Выберите счёт",
   "transactions.count": "{} транзакций",
   "transactions.pending": "Ожидающие транзакции",
   "transactions.query.clearAll": "Очистить фильтры",
diff --git a/assets/l10n/tr_TR.json b/assets/l10n/tr_TR.json
@@ -676,7 +676,6 @@
   "transactions.batch.import.success": "Başarıyla {n} işlem içe aktarıldı",
   "transactions.batch.importN": "{n} işlemi içe aktar",
   "transactions.batch.review": "Lütfen işlemleri gözden geçirin",
-  "transactions.batch.selectAccount": "Hesap seç",
   "transactions.count": "{} İşlemler",
   "transactions.pending": "Bekleyen işlemler",
   "transactions.query.clearAll": "Filtreleri temizle",
diff --git a/assets/l10n/uk_UA.json b/assets/l10n/uk_UA.json
@@ -676,7 +676,6 @@
   "transactions.batch.import.success": "Успішно імпортовано {n} транзакцій",
   "transactions.batch.importN": "Імпортувати {n} транзакцій",
   "transactions.batch.review": "Будь ласка, перегляньте транзакції",
-  "transactions.batch.selectAccount": "Вибрати рахунок",
   "transactions.count": "{} транзакцій",
   "transactions.pending": "Очікувані транзакції",
   "transactions.query.clearAll": "Очистити фільтри",
diff --git a/lib/routes/transaction_batch_import_page.dart b/lib/routes/transaction_batch_import_page.dart
@@ -36,7 +36,8 @@ class TransactionBatchImportPage extends StatefulWidget {
 class _TransactionBatchImportPageState
     extends State<TransactionBatchImportPage> {
   // final List<String> _assignedAccountUuids = [];
-  String? _massAssignedAccountUuid;
+  String? _fromAccountUuid;
+  String? _toAccountUuid;
 
   bool assignIndividually = false;
 
@@ -46,7 +47,7 @@ class _TransactionBatchImportPageState
   void initState() {
     super.initState();
     try {
-      _massAssignedAccountUuid = UserPreferencesService().primaryAccountUuid;
+      _fromAccountUuid = UserPreferencesService().primaryAccountUuid;
     } catch (e) {
       //
     }
@@ -56,12 +57,21 @@ class _TransactionBatchImportPageState
   Widget build(BuildContext context) {
     final List<Account> accounts = AccountsProvider.of(context).activeAccounts;
 
-    final Account? selectedAccount = _massAssignedAccountUuid == null
+    final Account? selectedFromAccount = _fromAccountUuid == null
         ? null
         : accounts.firstWhereOrNull(
-            (account) => account.uuid == _massAssignedAccountUuid,
+            (account) => account.uuid == _fromAccountUuid,
           );
 
+    final Account? selectedToAccount = _toAccountUuid == null
+        ? null
+        : accounts.firstWhereOrNull(
+            (account) => account.uuid == _toAccountUuid,
+          );
+
+    final bool hasAnyTransfer =
+        widget.params?.t.any((x) => x.type == .transfer) == true;
+
     return GestureDetector(
       child: CallbackShortcuts(
         bindings: {
@@ -115,26 +125,48 @@ class _TransactionBatchImportPageState
                 //     ),
                 //   ),
                 // ),
-                if (!assignIndividually)
+                if (!assignIndividually) ...[
                   Section(
-                    title: "transactions.batch.selectAccount".t(context),
+                    title: "account".t(context),
                     child: ListTile(
-                      leading: selectedAccount == null
+                      leading: selectedFromAccount == null
                           ? null
-                          : FlowIcon(selectedAccount.icon, plated: true),
+                          : FlowIcon(selectedFromAccount.icon, plated: true),
                       title: Text(
-                        selectedAccount?.name ??
+                        selectedFromAccount?.name ??
                             "transaction.edit.selectAccount".t(context),
                       ),
-                      subtitle: selectedAccount == null
+                      subtitle: selectedFromAccount == null
                           ? null
-                          : MoneyText(selectedAccount.balance),
-                      onTap: () => selectAccount(),
+                          : MoneyText(selectedFromAccount.balance),
+                      onTap: () => selectFromAccount(),
                       trailing: const Icon(Symbols.chevron_right),
                     ),
                   ),
+                  if (hasAnyTransfer)
+                    Section(
+                      title: "transaction.transfer.to".t(context),
+                      child: ListTile(
+                        leading: selectedToAccount == null
+                            ? null
+                            : FlowIcon(selectedToAccount.icon, plated: true),
+                        title: Text(
+                          selectedToAccount?.name ??
+                              "transaction.edit.selectAccount".t(context),
+                        ),
+                        subtitle: selectedToAccount == null
+                            ? null
+                            : MoneyText(selectedToAccount.balance),
+                        onTap: () => selectToAccount(),
+                        trailing: const Icon(Symbols.chevron_right),
+                      ),
+                    ),
+                ],
+
                 Button(
-                  onTap: _busy ? null : importTransactions,
+                  onTap: (_busy || (hasAnyTransfer && _toAccountUuid == null))
+                      ? null
+                      : importTransactions,
                   leading: FlowIcon(
                     FlowIconData.icon(Symbols.download_rounded),
                   ),
@@ -153,37 +185,63 @@ class _TransactionBatchImportPageState
     );
   }
 
-  void selectAccount() async {
+  void selectFromAccount() async {
     final accounts = AccountsProvider.of(context).activeAccounts;
 
-    if (accounts.length == 1) {
-      _massAssignedAccountUuid = accounts.first.uuid;
+    final selectedAccountId = accounts
+        .firstWhereOrNull((account) => account.uuid == _fromAccountUuid)
+        ?.id;
 
-      if (!mounted) return;
+    final Account? account =
+        accounts.singleOrNull ??
+        await showModalBottomSheet<Account>(
+          context: context,
+          builder: (context) => SelectAccountSheet(
+            accounts: accounts,
+            currentlySelectedAccountId: selectedAccountId,
+            showBalance: true,
+            showTrailing: false,
+          ),
+          isScrollControlled: true,
+        );
 
-      setState(() {});
+    if (account == null) return;
 
-      return;
+    _fromAccountUuid = account.uuid;
+    if (_toAccountUuid == _fromAccountUuid) {
+      _toAccountUuid = null;
     }
 
+    if (!mounted) return;
+
+    setState(() {});
+  }
+
+  void selectToAccount() async {
+    final accounts = AccountsProvider.of(context).activeAccounts
+        .where((account) => account.uuid != _fromAccountUuid)
+        .toList();
+
     final selectedAccountId = accounts
-        .firstWhereOrNull((account) => account.uuid == _massAssignedAccountUuid)
+        .firstWhereOrNull((account) => account.uuid == _toAccountUuid)
         ?.id;
 
-    final Account? account = await showModalBottomSheet<Account>(
-      context: context,
-      builder: (context) => SelectAccountSheet(
-        accounts: accounts,
-        currentlySelectedAccountId: selectedAccountId,
-        showBalance: true,
-        showTrailing: false,
-      ),
-      isScrollControlled: true,
-    );
+    final Account? account =
+        accounts.singleOrNull ??
+        await showModalBottomSheet<Account>(
+          context: context,
+          builder: (context) => SelectAccountSheet(
+            accounts: accounts,
+            currentlySelectedAccountId: selectedAccountId,
+            showBalance: true,
+            showTrailing: false,
+          ),
+          isScrollControlled: true,
+        );
 
     if (account == null) return;
 
-    _massAssignedAccountUuid = account.uuid;
+    _toAccountUuid = account.uuid;
 
     if (!mounted) return;
 
@@ -202,7 +260,7 @@ class _TransactionBatchImportPageState
 
     try {
       for (final TransactionProgrammableObject tpo in tpos) {
-        tpo.save(fromAccount: _massAssignedAccountUuid);
+        tpo.save(fromAccount: _fromAccountUuid, toAccount: _toAccountUuid);
       }
       if (!mounted) return;
 
diff --git a/lib/widgets/transaction_batch_import_page/tpo_preview_list_item.dart b/lib/widgets/transaction_batch_import_page/tpo_preview_list_item.dart
@@ -1,3 +1,5 @@
+import "dart:developer";
+
 import "package:flow/data/transaction_programmable_object.dart";
 import "package:flow/entity/account.dart";
 import "package:flow/entity/category.dart";
@@ -41,14 +43,16 @@ class _TpoPreviewListItemState extends State<TpoPreviewListItem> {
 
   @override
   Widget build(BuildContext context) {
+    inspect(estimate);
+
     return IgnorePointer(
       child: estimate == null
           ? SizedBox.shrink()
           : TransactionListTile(
               transaction: estimate!,
               recoverFromTrashFn: null,
               moveToTrashFn: null,
-              combineTransfers: true,
+              combineTransfers: false,
             ),
     );
   }
