Skip to content

Commit bf7f34f

Browse files
committed
Merge #869: gui: set max feerate in RBF modal
dfc4342 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 dfc4342 Tree-SHA512: 7f1fa5eb71ea2c5bc6b2c28bd79ba39e3be4b39fcade89e1978441937cbb75a9de8c52ea397fc0c7ef9ef3858995bca69a077b9c3625bb027d39e3d57bf3fa7f
2 parents 0346b7a + dfc4342 commit bf7f34f

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

gui/src/app/state/transactions.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::{
55
};
66

77
use iced::Command;
8-
use liana::miniscript::bitcoin::Txid;
8+
use liana::{miniscript::bitcoin::Txid, spend::MAX_FEERATE};
99
use liana_ui::{
1010
component::{form, modal::Modal},
1111
widget::*,
@@ -287,7 +287,7 @@ impl CreateRbfModal {
287287
self.warning = None;
288288
if let Ok(value) = s.parse::<u64>() {
289289
self.feerate_val.value = s;
290-
self.feerate_val.valid = value >= self.min_feerate_vb;
290+
self.feerate_val.valid = value >= self.min_feerate_vb && value <= MAX_FEERATE;
291291
if self.feerate_val.valid {
292292
self.feerate_vb = Some(value);
293293
}

gui/src/app/view/transactions.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,9 @@ pub fn create_rbf_modal<'a>(
187187
form::Form::new_trimmed("", feerate, move |msg| {
188188
Message::CreateRbf(CreateRbfMessage::FeerateEdited(msg))
189189
})
190-
.warning("Invalid feerate")
190+
.warning(
191+
"Feerate must be greater than previous value and less than or equal to 1000 sats/vbyte",
192+
)
191193
.size(20)
192194
.padding(10),
193195
)

0 commit comments

Comments
 (0)