Merge branch 'develop' of github.com:flow-mn/flow into develop

flow-mn · Oct 20, 2024 · 0ddd4c3 · 0ddd4c3
2 parents 6510469 + aeefd7c
commit 0ddd4c3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -149,11 +149,14 @@ class _HomeTabState extends State<HomeTab> 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,

diff --git 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"