From e66a3b30ee3a4b74358f11a5944ad3c97d8ff32a Mon Sep 17 00:00:00 2001 From: Batmend Ganbaatar Date: Sun, 20 Oct 2024 17:26:07 +0800 Subject: [PATCH 1/2] [BUG] Transfers no longer working Fixes #201 --- lib/objectbox/actions.dart | 4 ++-- lib/routes/home/home_tab.dart | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/objectbox/actions.dart b/lib/objectbox/actions.dart index f09c1d3..bea168b 100644 --- a/lib/objectbox/actions.dart +++ b/lib/objectbox/actions.dart @@ -513,7 +513,7 @@ extension AccountActions on Account { uuid: const Uuid().v4(), fromAccountUuid: uuid, toAccountUuid: targetAccount.uuid, - relatedTransactionUuid: toTransactionUuid, + relatedTransactionUuid: fromTransactionUuid, ); final String resolvedTitle = title ?? @@ -540,7 +540,7 @@ extension AccountActions on Account { title: resolvedTitle, description: description, extensions: [ - transferData.copyWith(relatedTransactionUuid: fromTransactionUuid), + transferData.copyWith(relatedTransactionUuid: toTransactionUuid), ...filteredExtensions, ], uuidOverride: toTransactionUuid, diff --git a/lib/routes/home/home_tab.dart b/lib/routes/home/home_tab.dart index 29a3fb1..503e2bf 100644 --- a/lib/routes/home/home_tab.dart +++ b/lib/routes/home/home_tab.dart @@ -149,11 +149,14 @@ class _HomeTabState extends State with AutomaticKeepAliveClientMixin { .where((transaction) => transaction.transactionDate.isAfter(now)) .groupByDate(); + final bool shouldCombineTransferIfNeeded = + currentFilter.accounts?.isNotEmpty != true; + return GroupedTransactionList( controller: widget.scrollController, transactions: grouped, futureTransactions: groupedFuture, - shouldCombineTransferIfNeeded: currentFilter.accounts?.isNotEmpty != true, + shouldCombineTransferIfNeeded: shouldCombineTransferIfNeeded, futureDivider: const WavyDivider(), listPadding: const EdgeInsets.only( top: 0, From aeefd7c3d497a579de0ebb0e8dc4b0905bcdb8eb Mon Sep 17 00:00:00 2001 From: Batmend Ganbaatar Date: Sun, 20 Oct 2024 17:26:28 +0800 Subject: [PATCH 2/2] bump ver --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index cdc0a6c..136b4fa 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: A personal finance managing app publish_to: "none" # Remove this line if you wish to publish to pub.dev -version: "0.7.0+59" +version: "0.7.1+60" environment: sdk: ">=3.5.0 <4.0.0"