From dfc4342d44cc2a3bcc080050fa636c5db78a2768 Mon Sep 17 00:00:00 2001 From: jp1ac4 <121959000+jp1ac4@users.noreply.github.com> Date: Tue, 12 Dec 2023 12:58:49 +0000 Subject: [PATCH] gui: set max feerate in RBF modal --- gui/src/app/state/transactions.rs | 4 ++-- gui/src/app/view/transactions.rs | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gui/src/app/state/transactions.rs b/gui/src/app/state/transactions.rs index 030ed459..3f314cc4 100644 --- a/gui/src/app/state/transactions.rs +++ b/gui/src/app/state/transactions.rs @@ -5,7 +5,7 @@ use std::{ }; use iced::Command; -use liana::miniscript::bitcoin::Txid; +use liana::{miniscript::bitcoin::Txid, spend::MAX_FEERATE}; use liana_ui::{ component::{form, modal::Modal}, widget::*, @@ -287,7 +287,7 @@ impl CreateRbfModal { self.warning = None; if let Ok(value) = s.parse::() { self.feerate_val.value = s; - self.feerate_val.valid = value >= self.min_feerate_vb; + self.feerate_val.valid = value >= self.min_feerate_vb && value <= MAX_FEERATE; if self.feerate_val.valid { self.feerate_vb = Some(value); } diff --git a/gui/src/app/view/transactions.rs b/gui/src/app/view/transactions.rs index 19d29cfe..8b201d9d 100644 --- a/gui/src/app/view/transactions.rs +++ b/gui/src/app/view/transactions.rs @@ -187,7 +187,9 @@ pub fn create_rbf_modal<'a>( form::Form::new_trimmed("", feerate, move |msg| { Message::CreateRbf(CreateRbfMessage::FeerateEdited(msg)) }) - .warning("Invalid feerate") + .warning( + "Feerate must be greater than previous value and less than or equal to 1000 sats/vbyte", + ) .size(20) .padding(10), )