Merge #869: gui: set max feerate in RBF modal

dfc4342d44cc2a3bcc080050fa636c5db78a2768 gui: set max feerate in RBF modal (jp1ac4)

Pull request description:

  This applies a similar change to feerate form validation as in #863 to ensure value is not too high.

  ![image](https://github.com/wizardsardine/liana/assets/121959000/caa31a99-8bc7-43bb-a2c2-a9d41d752f50)

ACKs for top commit:
  edouardparis:
    utACK dfc4342d44cc2a3bcc080050fa636c5db78a2768

Tree-SHA512: 7f1fa5eb71ea2c5bc6b2c28bd79ba39e3be4b39fcade89e1978441937cbb75a9de8c52ea397fc0c7ef9ef3858995bca69a077b9c3625bb027d39e3d57bf3fa7f
This commit is contained in:
Antoine Poinsot 2023-12-12 16:04:03 +01:00
commit bf7f34feeb
No known key found for this signature in database
GPG Key ID: E13FC145CD3F4304
2 changed files with 5 additions and 3 deletions

View File

@ -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::<u64>() {
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);
}

View File

@ -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),
)