BTCPay: improve feature

Foundation-Devices · May 24, 2024 · 8278066 · 8278066
1 parent 31ef0c5
commit 8278066
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 15 deletions.
diff --git a/lib/business/btcpay_voucher.dart b/lib/business/btcpay_voucher.dart
@@ -139,7 +139,6 @@ class BtcPayVoucher {
     } on TimeoutException {
       return BtcPayVoucherRedeemResult.voucherInvalid;
     }
-
     switch (response.statusCode) {
       case 200:
         {
@@ -149,9 +148,9 @@ class BtcPayVoucher {
       case 400 || 422:
         {
           final json = jsonDecode(response.body);
-          errorMessage = json[0]['message'] ?? "";
-          errorMessage = errorMessage.toLowerCase();
-          if (errorMessage.contains("onchain")) {
+          errorMessage = json['message'] ?? "";
+          String errorCode = json['code'] ?? "";
+          if (errorCode == "payment-method-not-supported") {
             errorType = BtcPayVoucherErrorType.onChain;
           }
 
@@ -171,9 +170,11 @@ class BtcPayVoucher {
   }
 }
 
-void addPendingTx(String pullPaymentId, String address, Account account) {
+void addPendingTx(
+    String pullPaymentId, String address, Account account, int? amountSats) {
   EnvoyStorage().addPendingTx(pullPaymentId, account.id ?? "", DateTime.now(),
-      TransactionType.btcPay, 0, 0, address);
+      TransactionType.btcPay, amountSats ?? 0, 0, address,
+      pullPaymentId: pullPaymentId);
   EnvoyStorage().addTxNote(note: "BTCPay voucher", key: address); // TODO: FIGMA
 }
 

diff --git a/lib/ui/home/cards/accounts/btcPay/btcpay_info.dart b/lib/ui/home/cards/accounts/btcPay/btcpay_info.dart
@@ -55,9 +55,11 @@ class BtcPayInfo extends StatelessWidget {
         ),
         if (voucher.amountSats != null)
           EnvoyAmount(
-              amountSats: voucher.amountSats!,
-              amountWidgetStyle: AmountWidgetStyle.normal,
-              account: account),
+            amountSats: voucher.amountSats!,
+            amountWidgetStyle: AmountWidgetStyle.normal,
+            account: account,
+            alignToEnd: false,
+          ),
         if (voucher.amountSats ==
             null) // TODO: what if amount is in strange currency
           Text("${voucher.amount!} ${voucher.currency!}",

diff --git a/lib/ui/home/cards/accounts/btcPay/btcpay_loading_payout.dart b/lib/ui/home/cards/accounts/btcPay/btcpay_loading_payout.dart
@@ -37,7 +37,8 @@ class BtcPayLoadingPayoutState extends State<BtcPayLoadingPayout> {
 
     if (result == BtcPayVoucherRedeemResult.success) {
       {
-        addPendingTx(widget.voucher.id, address, widget.account);
+        addPendingTx(widget.voucher.id, address, widget.account,
+            widget.voucher.amountSats);
         widget.controller.jumpToPage(4);
       }
     } else {

diff --git a/lib/ui/home/cards/accounts/detail/transaction/transactions_details.dart b/lib/ui/home/cards/accounts/detail/transaction/transactions_details.dart
@@ -258,6 +258,13 @@ class _TransactionsDetailsWidgetState
               trailing: Text(getTransactionStatusString(tx),
                   style: trailingTextStyle),
             ),
+            if (tx.pullPaymentId != null)
+              EnvoyInfoCardListItem(
+                title: S().coindetails_overlay_paymentID,
+                icon: const EnvoyIcon(EnvoyIcons.btcPay,
+                    color: EnvoyColors.textPrimary, size: EnvoyIconSize.small),
+                trailing: Text(tx.pullPaymentId!, style: trailingTextStyle),
+              ),
             if (tx.type == TransactionType.ramp)
               EnvoyInfoCardListItem(
                 title: S().coindetails_overlay_rampID,

diff --git a/lib/ui/state/transactions_state.dart b/lib/ui/state/transactions_state.dart
@@ -260,9 +260,9 @@ Future prunePendingTransactions(
       kPrint("Pruning BtcPay tx: ${actualBtcPayTx.txId}");
       EnvoyStorage().addTxNote(
           note: "BTCPay voucher", key: actualBtcPayTx.txId); // TODO: FIGMA
-      EnvoyStorage().deleteTxNote(pendingTx.address!);
-      EnvoyStorage().deletePendingTx(pendingTx.address!);
       actualBtcPayTx.setPullPaymentId(pendingTx.pullPaymentId);
+      EnvoyStorage().deleteTxNote(pendingTx.address!);
+      EnvoyStorage().deletePendingTx(pendingTx.txId);
     });
   }
   for (var pendingTx in ramp) {

diff --git a/lib/util/envoy_storage.dart b/lib/util/envoy_storage.dart
@@ -259,9 +259,17 @@ class EnvoyStorage {
         .then((event) => event.isNotEmpty);
   }
 
-  Future addPendingTx(String key, String accountId, DateTime timestamp,
-      wallet.TransactionType type, int amount, int fee, String address,
-      {String? purchaseViewToken}) async {
+  Future addPendingTx(
+    String key,
+    String accountId,
+    DateTime timestamp,
+    wallet.TransactionType type,
+    int amount,
+    int fee,
+    String address, {
+    String? purchaseViewToken,
+    String? pullPaymentId,
+  }) async {
     await pendingTxStore.record(key).put(_db, {
       'account': accountId,
       'timestamp': timestamp.millisecondsSinceEpoch,
@@ -270,6 +278,7 @@ class EnvoyStorage {
       'fee': fee,
       'address': address,
       'purchaseViewToken': purchaseViewToken,
+      'pullPaymentId': pullPaymentId,
     });
     return true;
   }
@@ -314,6 +323,7 @@ class EnvoyStorage {
           e["address"] as String,
           type: type,
           purchaseViewToken: e['purchaseViewToken'] as String?,
+          pullPaymentId: e['pullPaymentId'] as String?,
         );
       },
     ).toList();