Merge branch 'develop'

invoiceninja · Oct 25, 2023 · b3e120d · b3e120d
2 parents c3937a6 + 98c1171
commit b3e120d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/lib/ui/app/live_text.dart b/lib/ui/app/live_text.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 
 // Flutter imports:
 import 'package:flutter/widgets.dart';
+import 'package:window_manager/window_manager.dart';
 
 class LiveText extends StatefulWidget {
   const LiveText(
@@ -29,7 +30,16 @@ class _LiveTextState extends State<LiveText> {
     super.initState();
     _timer = Timer.periodic(
       widget.duration ?? Duration(milliseconds: 100),
-      (Timer timer) => mounted ? setState(() => false) : false,
+      (Timer timer) async {
+        final isFocused = await windowManager.isFocused();
+        if (!isFocused) {
+          return;
+        }
+
+        if (mounted) {
+          setState(() => false);
+        }
+      },
     );
   }
 

diff --git a/lib/ui/app/upgrade_dialog.dart b/lib/ui/app/upgrade_dialog.dart
@@ -287,8 +287,17 @@ class _UpgradeDialogState extends State<UpgradeDialog> {
     final url = (state.isStaging ? kAppStagingUrl : kAppProductionUrl) +
         '/api/admin/subscription';
 
+    var purchaseID = purchaseDetails.purchaseID;
+    if (purchaseDetails is AppStorePurchaseDetails) {
+      final originalTransaction =
+          purchaseDetails.skPaymentTransaction.originalTransaction;
+      if (originalTransaction != null) {
+        purchaseID = originalTransaction.transactionIdentifier;
+      }
+    }
+
     final data = {
-      'inapp_transaction_id': purchaseDetails.purchaseID,
+      'inapp_transaction_id': purchaseID,
       'key': state.account.key,
       'plan': purchaseDetails.productID.replaceAll('-', '_'),
       'plan_paid': (int.parse(purchaseDetails.transactionDate!) / 1000).floor(),