[WIP] Improve how refundable items are displayed

fixes #332 This is subject to change
breez · Jan 22, 2025 · 65c7d65 · 65c7d65
1 parent 4fe73cb
commit 65c7d65
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/...ets/payments_list/widgets/payment_details_sheet/widgets/payment_details_sheet_header.dart b/...ets/payments_list/widgets/payment_details_sheet/widgets/payment_details_sheet_header.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_breez_liquid/flutter_breez_liquid.dart';
 import 'package:l_breez/cubit/cubit.dart';
 import 'package:l_breez/routes/home/widgets/widgets.dart';
 
@@ -39,7 +40,8 @@ class _PaymentDetailsSheetHeaderState extends State<PaymentDetailsSheetHeader> {
           ),
           PaymentDetailsSheetContentTitle(paymentData: widget.paymentData),
           PaymentDetailsSheetDescription(paymentData: widget.paymentData),
-          if (widget.paymentData.isRefunded) ...<Widget>[
+          if (widget.paymentData.isRefunded ||
+              widget.paymentData.status == PaymentState.refundable) ...<Widget>[
             const Padding(
               padding: EdgeInsets.only(top: 8),
               child: Chip(

diff --git a/...ist/widgets/payment_details_sheet/widgets/payment_details_sheet_refund_tx_fee_amount.dart b/...ist/widgets/payment_details_sheet/widgets/payment_details_sheet_refund_tx_fee_amount.dart
@@ -45,7 +45,11 @@ class PaymentDetailsSheetRefundTxAmount extends StatelessWidget {
               builder: (BuildContext context, CurrencyState state) {
                 final String amountSats = BitcoinCurrency.fromTickerSymbol(
                   state.bitcoinTicker,
-                ).format(paymentData.refundTxAmountSat);
+                ).format(
+                  paymentData.status == PaymentState.refundable
+                      ? paymentData.amountSat + paymentData.feeSat
+                      : paymentData.refundTxAmountSat,
+                );
                 return Text(
                   paymentData.paymentType == PaymentType.receive || paymentData.isRefunded
                       ? texts.payment_details_dialog_amount_positive(amountSats)

diff --git a/lib/routes/home/widgets/payments_list/widgets/payment_item/widgets/payment_item_amount.dart b/lib/routes/home/widgets/payments_list/widgets/payment_item/widgets/payment_item_amount.dart
@@ -40,7 +40,7 @@ class PaymentItemAmount extends StatelessWidget {
                     : MainAxisAlignment.spaceAround,
                 crossAxisAlignment: CrossAxisAlignment.end,
                 children: <Widget>[
-                  (paymentData.isRefunded)
+                  (paymentData.isRefunded || paymentData.status == PaymentState.refundable)
                       ? const SizedBox.shrink()
                       : Text(
                           hideBalance

diff --git a/lib/routes/home/widgets/payments_list/widgets/payment_item/widgets/payment_item_avatar.dart b/lib/routes/home/widgets/payments_list/widgets/payment_item/widgets/payment_item_avatar.dart
@@ -31,7 +31,7 @@ class PaymentItemAvatar extends StatelessWidget {
         radius: radius,
         backgroundColor: Colors.white,
         child: Icon(
-          paymentData.isRefunded
+          paymentData.isRefunded || paymentData.status == PaymentState.refundable
               ? Icons.close_rounded
               : paymentData.paymentType == PaymentType.receive
                   ? Icons.add_rounded

diff --git a/...routes/home/widgets/payments_list/widgets/payment_item/widgets/payment_item_subtitle.dart b/...routes/home/widgets/payments_list/widgets/payment_item/widgets/payment_item_subtitle.dart
@@ -35,7 +35,7 @@ class PaymentItemSubtitle extends StatelessWidget {
             ),
           ),
         ],
-        if (paymentData.isRefunded) ...<Widget>[
+        if (paymentData.isRefunded || paymentData.status == PaymentState.refundable) ...<Widget>[
           Text(
             ' (Failed)',
             style: subtitleTextStyle.copyWith(