Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GUI] Limit amount to 8 decimal digits #992

Merged
merged 1 commit into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions gui/src/app/view/spend/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,9 @@ pub fn create_spend_tx<'a>(

pub fn recipient_view<'a>(
index: usize,
address: &form::Value<String>,
amount: &form::Value<String>,
label: &form::Value<String>,
address: &'a form::Value<String>,
amount: &'a form::Value<String>,
label: &'a form::Value<String>,
is_max_selected: bool,
) -> Element<'a, CreateSpendMessage> {
Container::new(
Expand Down Expand Up @@ -395,7 +395,7 @@ pub fn recipient_view<'a>(
None
})
.push_maybe(if !is_max_selected {
Some(form::Form::new_trimmed("0.001 (in BTC)", amount, move |msg| {
Some(form::Form::new_amount_btc("0.001 (in BTC)", amount, move |msg| {
CreateSpendMessage::RecipientEdited(index, "amount", msg)
})
.warning(
Expand Down
24 changes: 24 additions & 0 deletions gui/ui/src/component/form.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use bitcoin::Denomination;
use iced::{widget::text_input, Length};

use crate::{color, component::text, theme, util::Collection, widget::*};
Expand Down Expand Up @@ -62,6 +63,29 @@ where
}
}

/// Creates a new [`Form`] that restrict input values to valid btc amount before applying the
/// `on_change` function.
/// It expects:
/// - a placeholder
/// - the current value
/// - a function that produces a message when the [`Form`] changes
pub fn new_amount_btc<F>(placeholder: &str, value: &'a Value<String>, on_change: F) -> Self
where
F: 'static + Fn(String) -> Message,
{
Self {
input: text_input::TextInput::new(placeholder, &value.value).on_input(move |s| {
if bitcoin::Amount::from_str_in(&s, Denomination::Bitcoin).is_ok() || s.is_empty() {
on_change(s)
} else {
on_change(value.value.clone())
}
}),
warning: None,
valid: value.valid,
}
}

/// Sets the [`Form`] with a warning message
pub fn warning(mut self, warning: &'a str) -> Self {
self.warning = Some(warning);
Expand Down
Loading