Merge pull request #682 from flow-mn/develop

fixes, karma, close #681

Author: sadespresso

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.19.4
+
+### Fixes
+
+* Fixed duplicating transfers reversed their accounts
+* Fixed home page pending transactions not showing, closes [#681](https://github.com/flow-mn/flow/issues/681)
+
+### Changes
+
+* Added an optional `transaction date` field to Shortcut action (iOS)
+
 ## 0.19.3
 
 ### Fixes

ios/Runner/RecordTransactionIntent.swift

@@ -19,6 +19,9 @@ struct RecordTransactionIntent: AppIntent {
     @Parameter(title: "Title", description: "Transaction title.")
     var title: String?
 
+    @Parameter(title: "Date of transaction", description: "Date.")
+    var transactionDate: Date?
+
     static var openAppWhenRun = false
 
     func perform() async throws -> some IntentResult & ProvidesDialog {
@@ -30,15 +33,17 @@ struct RecordTransactionIntent: AppIntent {
         if let number = formatter.number(from: amount) {
             parsedAmount = number.doubleValue
         } else {
-            let digitsOnly = amount.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
+            let digitsOnly = amount.replacingOccurrences(
+                of: "[^0-9]", with: "", options: .regularExpression)
             let hadDecimalSeparator = amount.contains(formatter.decimalSeparator)
             guard let fallbackNumber = Double(digitsOnly) else {
                 throw NSError(domain: "InvalidAmount", code: 1)
             }
             parsedAmount = fallbackNumber / (hadDecimalSeparator ? 100 : 1)
         }
         let tx = RecordedTransaction(
-            type: .expense, amount: parsedAmount, title: title, fromAccount: account, category: category,
+            transactionDate: transactionDate ?? Date(), type: .expense, amount: parsedAmount,
+            title: title, fromAccount: account, category: category,
             notes: notes)
         try RecordedTransactionService.append(tx)
         return .result(dialog: "Expense recorded ✅")

lib/data/transaction_programmable_object.dart

@@ -4,6 +4,7 @@ import "package:flow/services/user_preferences.dart";
 import "package:flow/utils/loose_parsers.dart";
 import "package:flow/utils/money_parsing.dart";
 import "package:flow/utils/utils.dart";
+import "package:moment_dart/moment_dart.dart";
 import "package:uuid/uuid.dart";
 
 class TransactionProgrammableObject {
@@ -107,6 +108,12 @@ class TransactionProgrammableObject {
       _ => null,
     };
 
+    final bool isPending =
+        (looseString(params["isPending"])?.toLowerCase() == "true")
+        ? true
+        : (transactionDate?.isAfter(DateTime.now().startOfNextMinute()) ??
+              false);
+
     return TransactionProgrammableObject(
       transactionDate: transactionDate,
       categoryUuid: looseString(params["categoryUuid"]),
@@ -119,7 +126,7 @@ class TransactionProgrammableObject {
       toAccountUuid: looseString(params["toAccountUuid"]),
       toAccount: looseString(params["toAccount"]),
       type: type,
-      isPending: looseString(params["isPending"])?.toLowerCase() == "true",
+      isPending: isPending,
       transferConversionRate: looseDouble(params["transferConversionRate"]),
       tagsUuids: looseStringList(params["tagsUuids"]),
       tags: looseStringList(params["tags"]),

lib/objectbox/actions.dart

@@ -637,7 +637,7 @@ extension TransactionActions on Transaction {
 
       final (int a, _) = fromAccount.transferTo(
         targetAccount: toAccount,
-        amount: amount,
+        amount: amount.abs(),
         description: description,
         createdDate: Moment.now(),
         isPending: isPending,
@@ -649,6 +649,7 @@ extension TransactionActions on Transaction {
         extensions: extensions.data,
         latitude: extensions.geo?.latitude,
         longitude: extensions.geo?.longitude,
+        conversionRate: transferDetails.conversionRate,
       );
 
       return a;

lib/routes/home/home_tab.dart

@@ -144,10 +144,14 @@ class _HomeTabState extends State<HomeTab> with AutomaticKeepAliveClientMixin {
             );
 
             final List<Transaction> transactions = [
-              ...?pendingTransactionsSnapshot.data,
-              ...?currentTransactionsSnapshot.data?.where(
-                (t) => t.isPending != true,
+              ...?pendingTransactionsSnapshot.data?.where(
+                (transaction) =>
+                    normalizedCurrentFilter.range?.range?.contains(
+                      transaction.transactionDate,
+                    ) !=
+                    true,
               ),
+              ...?currentTransactionsSnapshot.data,
             ];
 
             if (currentFilter.range?.range?.contains(now) == true) {

lib/utils/extensions/iterables.dart

@@ -20,6 +20,15 @@ extension Iterables<E> on Iterable<E> {
         return map;
       });
 
+  List<E> uniqueBy<T>(T Function(E) selector) {
+    final Map<T, E> items = {};
+    for (final E element in this) {
+      final T key = selector(element);
+      items[key] = element;
+    }
+    return items.values.toList();
+  }
+
   E? firstWhereOrNull(bool Function(E element) test) {
     for (var element in this) {
       if (test(element)) return element;

lib/widgets/grouped_transactions_list_view.dart

@@ -168,6 +168,7 @@ class _GroupedTransactionsListViewState
             index: index,
             key: ValueKey(transaction.uuid),
             child: TransactionListTile(
+              key: ValueKey(transaction.id),
               combineTransfers: combineTransfers,
               transaction: transaction,
               dismissibleKey: ValueKey(transaction.id),

macos/Podfile.lock

@@ -1,164 +1,52 @@
 PODS:
-  - app_links (6.4.1):
-    - FlutterMacOS
-  - connectivity_plus (0.0.1):
-    - FlutterMacOS
-  - desktop_drop (0.0.1):
-    - FlutterMacOS
-  - file_picker (0.0.1):
-    - FlutterMacOS
   - file_saver (0.0.1):
     - FlutterMacOS
-  - file_selector_macos (0.0.1):
-    - FlutterMacOS
-  - flutter_app_group_directory (0.0.1):
-    - FlutterMacOS
-  - flutter_local_notifications (0.0.1):
-    - FlutterMacOS
-  - flutter_timezone (0.1.0):
+  - flutter_contacts (0.0.1):
     - FlutterMacOS
   - FlutterMacOS (1.0.0)
-  - geolocator_apple (1.2.0):
-    - Flutter
-    - FlutterMacOS
   - icloud_storage (0.0.1):
     - FlutterMacOS
-  - in_app_review (2.0.0):
-    - FlutterMacOS
-  - local_auth_darwin (0.0.1):
-    - Flutter
-    - FlutterMacOS
   - ObjectBox (5.2.0)
   - objectbox_flutter_libs (0.0.1):
     - FlutterMacOS
     - ObjectBox (= 5.2.0)
-  - package_info_plus (0.0.1):
-    - FlutterMacOS
-  - pasteboard (0.0.1):
-    - FlutterMacOS
-  - path_provider_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - quill_native_bridge_macos (0.0.1):
-    - FlutterMacOS
   - screen_retriever_macos (0.0.1):
     - FlutterMacOS
-  - share_plus (0.0.1):
-    - FlutterMacOS
-  - shared_preferences_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - url_launcher_macos (0.0.1):
-    - FlutterMacOS
-  - window_manager (0.5.0):
-    - FlutterMacOS
 
 DEPENDENCIES:
-  - app_links (from `Flutter/ephemeral/.symlinks/plugins/app_links/macos`)
-  - connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos`)
-  - desktop_drop (from `Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos`)
-  - file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`)
   - file_saver (from `Flutter/ephemeral/.symlinks/plugins/file_saver/macos`)
-  - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`)
-  - flutter_app_group_directory (from `Flutter/ephemeral/.symlinks/plugins/flutter_app_group_directory/macos`)
-  - flutter_local_notifications (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos`)
-  - flutter_timezone (from `Flutter/ephemeral/.symlinks/plugins/flutter_timezone/macos`)
+  - flutter_contacts (from `Flutter/ephemeral/.symlinks/plugins/flutter_contacts/macos`)
   - FlutterMacOS (from `Flutter/ephemeral`)
-  - geolocator_apple (from `Flutter/ephemeral/.symlinks/plugins/geolocator_apple/darwin`)
   - icloud_storage (from `Flutter/ephemeral/.symlinks/plugins/icloud_storage/macos`)
-  - in_app_review (from `Flutter/ephemeral/.symlinks/plugins/in_app_review/macos`)
-  - local_auth_darwin (from `Flutter/ephemeral/.symlinks/plugins/local_auth_darwin/darwin`)
   - objectbox_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/objectbox_flutter_libs/macos`)
-  - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
-  - pasteboard (from `Flutter/ephemeral/.symlinks/plugins/pasteboard/macos`)
-  - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
-  - quill_native_bridge_macos (from `Flutter/ephemeral/.symlinks/plugins/quill_native_bridge_macos/macos`)
   - screen_retriever_macos (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos`)
-  - share_plus (from `Flutter/ephemeral/.symlinks/plugins/share_plus/macos`)
-  - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
-  - window_manager (from `Flutter/ephemeral/.symlinks/plugins/window_manager/macos`)
 
 SPEC REPOS:
   trunk:
     - ObjectBox
 
 EXTERNAL SOURCES:
-  app_links:
-    :path: Flutter/ephemeral/.symlinks/plugins/app_links/macos
-  connectivity_plus:
-    :path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos
-  desktop_drop:
-    :path: Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos
-  file_picker:
-    :path: Flutter/ephemeral/.symlinks/plugins/file_picker/macos
   file_saver:
     :path: Flutter/ephemeral/.symlinks/plugins/file_saver/macos
-  file_selector_macos:
-    :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos
-  flutter_app_group_directory:
-    :path: Flutter/ephemeral/.symlinks/plugins/flutter_app_group_directory/macos
-  flutter_local_notifications:
-    :path: Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos
-  flutter_timezone:
-    :path: Flutter/ephemeral/.symlinks/plugins/flutter_timezone/macos
+  flutter_contacts:
+    :path: Flutter/ephemeral/.symlinks/plugins/flutter_contacts/macos
   FlutterMacOS:
     :path: Flutter/ephemeral
-  geolocator_apple:
-    :path: Flutter/ephemeral/.symlinks/plugins/geolocator_apple/darwin
   icloud_storage:
     :path: Flutter/ephemeral/.symlinks/plugins/icloud_storage/macos
-  in_app_review:
-    :path: Flutter/ephemeral/.symlinks/plugins/in_app_review/macos
-  local_auth_darwin:
-    :path: Flutter/ephemeral/.symlinks/plugins/local_auth_darwin/darwin
   objectbox_flutter_libs:
     :path: Flutter/ephemeral/.symlinks/plugins/objectbox_flutter_libs/macos
-  package_info_plus:
-    :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos
-  pasteboard:
-    :path: Flutter/ephemeral/.symlinks/plugins/pasteboard/macos
-  path_provider_foundation:
-    :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
-  quill_native_bridge_macos:
-    :path: Flutter/ephemeral/.symlinks/plugins/quill_native_bridge_macos/macos
   screen_retriever_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos
-  share_plus:
-    :path: Flutter/ephemeral/.symlinks/plugins/share_plus/macos
-  shared_preferences_foundation:
-    :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin
-  url_launcher_macos:
-    :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
-  window_manager:
-    :path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos
 
 SPEC CHECKSUMS:
-  app_links: 05a6ec2341985eb05e9f97dc63f5837c39895c3f
-  connectivity_plus: 4adf20a405e25b42b9c9f87feff8f4b6fde18a4e
-  desktop_drop: 10a3e6a7fa9dbe350541f2574092fecfa345a07b
-  file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a
   file_saver: e35bd97de451dde55ff8c38862ed7ad0f3418d0f
-  file_selector_macos: 9e9e068e90ebee155097d00e89ae91edb2374db7
-  flutter_app_group_directory: 14eb7e7a2b0e30a6a68bb855197b4ed6f5063e55
-  flutter_local_notifications: 4bf37a31afde695b56091b4ae3e4d9c7a7e6cda0
-  flutter_timezone: d272288c69082ad571630e0d17140b3d6b93dc0c
+  flutter_contacts: 22579d648c4278eefa588e8392499f10540a24b2
   FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
-  geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
   icloud_storage: eb5b0f20687cf5a4fabc0b541f3b079cd6df7dcb
-  in_app_review: 66e7680752b632d83f4f0e88b34d52ed303fbff4
-  local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb
   ObjectBox: 946c1e8586aaa61e21b6661bab4948d06fdd51c4
   objectbox_flutter_libs: 52ffb4ad42870c47886c2c6a7528e76b770af6d9
-  package_info_plus: f0052d280d17aa382b932f399edf32507174e870
-  pasteboard: 278d8100149f940fb795d6b3a74f0720c890ecb7
-  path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
-  quill_native_bridge_macos: 2b005cb56902bb740e0cd9620aa399dfac6b4882
   screen_retriever_macos: 452e51764a9e1cdb74b3c541238795849f21557f
-  share_plus: 510bf0af1a42cd602274b4629920c9649c52f4cc
-  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
-  url_launcher_macos: f87a979182d112f911de6820aefddaf56ee9fbfd
-  window_manager: b729e31d38fb04905235df9ea896128991cad99e
 
 PODFILE CHECKSUM: 3d7cd7f90b4de5948ed6e76869b40159643b2f0c
 

macos/Runner.xcodeproj/project.pbxproj

@@ -93,6 +93,7 @@
 		C7ABF111C6B24A94C5590605 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
 		EF2119E4452EB90D74660621 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		FF8EDF75036434848BA3CFBA /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -170,6 +171,7 @@
 		33CEB47122A05771004F2AC0 /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
+				78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
 				335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */,
 				33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */,
 				33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */,

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.19.3+331"
+version: "0.19.4+332"
 
 environment:
     sdk: ">=3.10.0 <4.0.0"