From a7f2ca1cbee7030e9c51506a2c6e1136f6b3a463 Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Sun, 5 Feb 2023 15:21:10 +0100 Subject: [PATCH 1/3] gui: Remove redundant "or" when filling up xpub in installer. --- gui/src/installer/view.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gui/src/installer/view.rs b/gui/src/installer/view.rs index c63cd08d..3446ca35 100644 --- a/gui/src/installer/view.rs +++ b/gui/src/installer/view.rs @@ -1133,11 +1133,7 @@ pub fn edit_key_modal<'a>( Row::new() .spacing(15) .width(Length::Fill) - .push( - text("Or connect a hardware wallet") - .bold() - .width(Length::Fill), - ) + .push(text("Connect a hardware wallet").bold().width(Length::Fill)) .push(button::border(None, "Refresh").on_press(Message::Reload)) .align_items(Alignment::Center), ) From c6127c41c99d9775ecc177928a2ec9fdc94e13a0 Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Sun, 5 Feb 2023 15:25:54 +0100 Subject: [PATCH 2/3] gui: wording nit on missing feerate when creating a spend. --- gui/src/app/view/spend/step.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/src/app/view/spend/step.rs b/gui/src/app/view/spend/step.rs index d2e683d9..bb3fb7d4 100644 --- a/gui/src/app/view/spend/step.rs +++ b/gui/src/app/view/spend/step.rs @@ -170,7 +170,7 @@ pub fn choose_coins_view<'a>( .push(text("Amount left to select:")) .push(text(amount_left.to_string()).bold()) } else { - Row::new().push(text("Please, define feerate")) + Row::new().push(text("Feerate needs to be set.")) }) .width(Length::Fill), ) From f545747080fdfc4a02216256a6b6da2e3d22078d Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Sun, 5 Feb 2023 15:32:43 +0100 Subject: [PATCH 3/3] gui: reword some warnings on invalid input --- gui/src/app/view/recovery.rs | 4 ++-- gui/src/app/view/spend/step.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gui/src/app/view/recovery.rs b/gui/src/app/view/recovery.rs index 0fd90b27..c4367e7f 100644 --- a/gui/src/app/view/recovery.rs +++ b/gui/src/app/view/recovery.rs @@ -61,7 +61,7 @@ pub fn recovery<'a>( 0, "address", msg, )) }) - .warning("Please enter correct bitcoin address") + .warning("Invalid Bitcoin address") .size(20) .padding(10), ) @@ -72,7 +72,7 @@ pub fn recovery<'a>( form::Form::new("Feerate (sat/vbyte)", feerate, move |msg| { Message::CreateSpend(CreateSpendMessage::FeerateEdited(msg)) }) - .warning("Please enter correct feerate (sat/vbyte)") + .warning("Invalid feerate") .size(20) .padding(10), ) diff --git a/gui/src/app/view/spend/step.rs b/gui/src/app/view/spend/step.rs index bb3fb7d4..2e478d7f 100644 --- a/gui/src/app/view/spend/step.rs +++ b/gui/src/app/view/spend/step.rs @@ -91,7 +91,7 @@ pub fn recipient_view<'a>( form::Form::new("Address", address, move |msg| { CreateSpendMessage::RecipientEdited(index, "address", msg) }) - .warning("Please enter correct bitcoin address for the current network") + .warning("Invalid address (maybe it is for another network?)") .size(20) .padding(10), ) @@ -100,7 +100,7 @@ pub fn recipient_view<'a>( form::Form::new("Amount", amount, move |msg| { CreateSpendMessage::RecipientEdited(index, "amount", msg) }) - .warning("Please enter correct amount (> 0.00005000 btc)") + .warning("Invalid amount. Must be > 0.00005000 BTC.") .size(20) .padding(10), ) @@ -134,7 +134,7 @@ pub fn choose_coins_view<'a>( form::Form::new("Feerate (sat/vbyte)", feerate, move |msg| { Message::CreateSpend(CreateSpendMessage::FeerateEdited(msg)) }) - .warning("Please enter correct feerate (sat/vbyte)") + .warning("Invalid feerate") .size(20) .padding(10), )