Merge pull request #666 from breez/ok300-add-feerate-arg-create-invoice

Add fee params arg to createInvoice
breez · Oct 10, 2023 · e398efa · e398efa
2 parents d4e9e5f + 8308ef9
commit e398efa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/bloc/account/account_bloc.dart b/lib/bloc/account/account_bloc.dart
@@ -274,10 +274,11 @@ class AccountBloc extends Cubit<AccountState> with HydratedMixin {
   Future<sdk.ReceivePaymentResponse> addInvoice({
     String description = "",
     required int amountSats,
+    required sdk.OpeningFeeParams? chosenFeeParams,
   }) async {
     _log.fine("addInvoice: $description, $amountSats");
 
-    final requestData = sdk.ReceivePaymentRequest(amountSats: amountSats, description: description);
+    final requestData = sdk.ReceivePaymentRequest(amountSats: amountSats, description: description, openingFeeParams: chosenFeeParams);
     final responseData = await _breezLib.receivePayment(reqData: requestData);
     return responseData;
   }

diff --git a/lib/routes/create_invoice/create_invoice_page.dart b/lib/routes/create_invoice/create_invoice_page.dart
@@ -78,6 +78,10 @@ class CreateInvoicePageState extends State<CreateInvoicePage> {
   Widget build(BuildContext context) {
     final texts = context.texts();
 
+    final lspState = context.watch<LSPBloc>().state;
+    final cheapestFeeParams = lspState?.lspInfo?.openingFeeParamsList.values.first;
+    final isChannelOpeningAvailable = lspState?.isChannelOpeningAvailable ?? false;
+
     return Scaffold(
       key: _scaffoldKey,
       appBar: AppBar(
@@ -123,7 +127,6 @@ class CreateInvoicePageState extends State<CreateInvoicePage> {
                     builder: (context, accountState, currencyState, lspState) {
                       return ReceivableBTCBox(
                         onTap: () {
-                          final isChannelOpeningAvailable = lspState?.isChannelOpeningAvailable ?? false;
                           if (!isChannelOpeningAvailable && accountState.maxInboundLiquidity > 0) {
                             _amountController.text = currencyState.bitcoinCurrency.format(
                               accountState.maxInboundLiquidity,
@@ -158,7 +161,7 @@ class CreateInvoicePageState extends State<CreateInvoicePage> {
             if (data != null) {
               _withdraw(context, data);
             } else {
-              _createInvoice(context);
+              _createInvoice(context, cheapestFeeParams);
             }
           }
         },
@@ -191,7 +194,7 @@ class CreateInvoicePageState extends State<CreateInvoicePage> {
     );
   }
 
-  Future _createInvoice(BuildContext context) async {
+  Future _createInvoice(BuildContext context, OpeningFeeParams? cheapestFeeParams) async {
     _log.fine("Create invoice: description=${_descriptionController.text}, amount=${_amountController.text}");
     final navigator = Navigator.of(context);
     final currentRoute = ModalRoute.of(navigator.context)!;
@@ -201,6 +204,7 @@ class CreateInvoicePageState extends State<CreateInvoicePage> {
     Future<ReceivePaymentResponse> receivePaymentResponse = accountBloc.addInvoice(
       description: _descriptionController.text,
       amountSats: currencyBloc.state.bitcoinCurrency.parse(_amountController.text),
+      chosenFeeParams: cheapestFeeParams
     );
     navigator.pop();
     Widget dialog = FutureBuilder(