nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #325: Gui wording nits

Browse Source 
f545747080fdfc4a02216256a6b6da2e3d22078d gui: reword some warnings on invalid input (Antoine Poinsot)
c6127c41c99d9775ecc177928a2ec9fdc94e13a0 gui: wording nit on missing feerate when creating a spend. (Antoine Poinsot)
a7f2ca1cbee7030e9c51506a2c6e1136f6b3a463 gui: Remove redundant "or" when filling up xpub in installer. (Antoine Poinsot)

Pull request description:

  Some things i noticed while testing. Not perfect nor comprehensive, but still an improvement IMO.

ACKs for top commit:
  edouardparis:
    ACK f545747080fdfc4a02216256a6b6da2e3d22078d

Tree-SHA512: c1b098058cbff6617fb197d235ef6755702499b435414659317be2d0bfffe91e018d9069d1e5741c80b446fbee395cb4f6e7cbc4d457583a3bc04f66d9f3cbc6
This commit is contained in:
edouard 2023-02-06 08:50:01 +01:00
commit 5b0aac1782
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/src/app/view/recovery.rs
View File

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

8
gui/src/app/view/spend/step.rs
View File

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

6
gui/src/installer/view.rs
View File

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