Compare payment amount against maxPayableSat from onchainPaymentLimits

breez · Jul 16, 2024 · 63ca0c7 · 63ca0c7
1 parent 71cda9e
commit 63ca0c7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/lib/bloc/reverse_swap/reverse_swap_bloc.dart b/lib/bloc/reverse_swap/reverse_swap_bloc.dart
@@ -133,12 +133,13 @@ class ReverseSwapBloc extends Cubit<ReverseSwapState> {
     try {
       OnchainPaymentLimitsResponse paymentLimits = await _breezSDK.onchainPaymentLimits();
       _log.info(
-        "Current maximum ${paymentLimits.maxSat} and "
-        "minimum ${paymentLimits.minSat} payment limits for onchain payments",
+        "Current minimum ${paymentLimits.minSat} and "
+        "maximum ${paymentLimits.maxSat} payment limits, in sats, for onchain payments."
+        "\nMaximum amount this node can send with the current channels and the current local balance: ${paymentLimits.maxPayableSat} (sats).",
       );
       return paymentLimits;
     } catch (e) {
-      _log.severe("fetchOnchainPaymentLimits error", e);
+      _log.severe("onchainPaymentLimits error", e);
       rethrow;
     }
   }

diff --git a/lib/routes/withdraw/redeem_onchain_funds/redeem_onchain_funds_page.dart b/lib/routes/withdraw/redeem_onchain_funds/redeem_onchain_funds_page.dart
@@ -88,7 +88,7 @@ class _RedeemFundsPageState extends State<RedeemFundsPage> {
                           widget.walletBalanceSat,
                           widget.walletBalanceSat,
                         ),
-                        balanceSat: widget.walletBalanceSat,
+                        maxPayableSat: widget.walletBalanceSat,
                       );
                     },
                   ),

diff --git a/lib/routes/withdraw/reverse_swap/reverse_swap_form.dart b/lib/routes/withdraw/reverse_swap/reverse_swap_form.dart
@@ -84,7 +84,7 @@ class _ReverseSwapFormState extends State<ReverseSwapForm> {
               bitcoinCurrency: widget.bitcoinCurrency,
               controller: widget.amountController,
               withdrawMaxValue: widget.withdrawMaxValue,
-              balanceSat: widget.paymentLimits.maxSat,
+              maxPayableSat: widget.paymentLimits.maxPayableSat,
               policy: WithdrawFundsPolicy(
                 WithdrawKind.withdraw_funds,
                 widget.paymentLimits.minSat,
@@ -105,7 +105,7 @@ class _ReverseSwapFormState extends State<ReverseSwapForm> {
                   setState(() {
                     widget.onChanged(value);
                     if (widget.withdrawMaxValue) {
-                      _setAmount(widget.paymentLimits.maxSat);
+                      _setAmount(widget.paymentLimits.maxPayableSat);
                     } else {
                       widget.amountController.text = "";
                     }

diff --git a/lib/routes/withdraw/reverse_swap/reverse_swap_page.dart b/lib/routes/withdraw/reverse_swap/reverse_swap_page.dart
@@ -14,32 +14,33 @@ final _log = Logger("ReverseSwapPage");
 
 class ReverseSwapPage extends StatefulWidget {
   final BitcoinAddressData? btcAddressData;
+
   const ReverseSwapPage({super.key, required this.btcAddressData});
 
   @override
   State<ReverseSwapPage> createState() => _ReverseSwapPageState();
 }
 
 class _ReverseSwapPageState extends State<ReverseSwapPage> {
-  Future<OnchainPaymentLimitsResponse>? _revSwapOptionsFuture;
+  Future<OnchainPaymentLimitsResponse>? _onchainPaymentLimitsFuture;
 
   @override
   void initState() {
     super.initState();
-    _fetchReverseSwapPairInfo();
+    _fetchOnchainPaymentLimits();
   }
 
   void didChangeAppLifecycleState(AppLifecycleState state) {
     if (state == AppLifecycleState.resumed) {
-      _fetchReverseSwapPairInfo();
+      _fetchOnchainPaymentLimits();
     }
   }
 
-  Future _fetchReverseSwapPairInfo() async {
-    _log.info("Fetching reverse swap pair info");
+  Future _fetchOnchainPaymentLimits() async {
+    _log.info("Fetching onchain payment limits");
     final revSwapBloc = context.read<ReverseSwapBloc>();
     setState(() {
-      _revSwapOptionsFuture = revSwapBloc.onchainPaymentLimits();
+      _onchainPaymentLimitsFuture = revSwapBloc.onchainPaymentLimits();
     });
   }
 
@@ -54,7 +55,7 @@ class _ReverseSwapPageState extends State<ReverseSwapPage> {
         title: Text(texts.reverse_swap_title),
       ),
       body: FutureBuilder<OnchainPaymentLimitsResponse>(
-        future: _revSwapOptionsFuture,
+        future: _onchainPaymentLimitsFuture,
         builder: (BuildContext context, AsyncSnapshot<OnchainPaymentLimitsResponse> snapshot) {
           if (snapshot.hasError) {
             return Center(

diff --git a/lib/routes/withdraw/widgets/withdraw_funds_amount_text_form_field.dart b/lib/routes/withdraw/widgets/withdraw_funds_amount_text_form_field.dart
@@ -18,7 +18,7 @@ class WithdrawFundsAmountTextFormField extends AmountFormField {
     required TextEditingController super.controller,
     required bool withdrawMaxValue,
     required WithdrawFundsPolicy policy,
-    required int balanceSat,
+    required int maxPayableSat,
   }) : super(
           texts: context.texts(),
           readOnly: policy.withdrawKind == WithdrawKind.unexpected_funds || withdrawMaxValue,
@@ -36,7 +36,7 @@ class WithdrawFundsAmountTextFormField extends AmountFormField {
                 if (amountSat > policy.maxValue) {
                   throw PaymentExceededLimitError(policy.maxValue);
                 }
-                if (amountSat > balanceSat) {
+                if (amountSat > maxPayableSat) {
                   throw const InsufficientLocalBalanceError();
                 }
               },