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

Merge #482: Some wording cleanups all around the GUI

Browse Source 
6bf29123670a4304127859c98e7e9bf689721789 recovery view: some wording tweaks (Antoine Poinsot)
01749433585ed76b8f4de58e133d97b7a66a0384 rescan view: some wording cleanups (Antoine Poinsot)
2931ed57f6a2287e8440ad2eb41e18db6de3e4ff ui: some wording tweaks in badges (Antoine Poinsot)
b47ce427945f394b2c96eb9625667b66beabab81 spend view: cleanup text input placeholders (Antoine Poinsot)
53896eec8b89c24cc53a75084c20270c1dcb5e36 psbt view: remove mentions of 'drafts' (Antoine Poinsot)
139273b87fd7357569d0c0fa83d4801158ad0856 view: 'self send' -> 'send-to-self' (Antoine Poinsot)
43b207a4f50628d0d830a56b858340a798084467 psbt: wording in coins spent (Antoine Poinsot)
7dd62f487918d6fce6a4348ee4ed9bb2e3ea170f psbt: wording in available spending paths (Antoine Poinsot)
34ea132ba1531bd13a9f46a096e8a7c109fad461 home: have a space after a comma (Antoine Poinsot)
a884b46102276fd849d1b71087317e987c385d36 home: better wording for recovery path availability (Antoine Poinsot)

Pull request description:

  Fixes #460.
  Fixes #446.

ACKs for top commit:
  edouardparis:
    ACK 6bf29123670a4304127859c98e7e9bf689721789

Tree-SHA512: 4827bbbed81a684477401486f48e6264335703048baabce41e5e426186e05807f8245330ced7c1594508bb3c945d988d17b647eef367ae943bfa3a4797a2b4de
This commit is contained in:
edouard 2023-05-07 15:40:03 +02:00
commit f66ba7c238
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
8 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gui/src/app/view/home.rs
View File

@ -56,8 +56,8 @@ pub fn home_view<'a>(
.align_items(Alignment::Center)
.push(
h4_regular(format!(
"Your next coin to expire will in ≈ {}",
coins::expire_message_units(sequence).join(",")
"≈ {} left before first recovery path becomes available.",
coins::expire_message_units(sequence).join(", ")
))
.width(Length::Fill),
)
@ -80,7 +80,7 @@ pub fn home_view<'a>(
.align_items(Alignment::Center)
.push(
h4_regular(format!(
"You have {} coins that are already or about to be expired",
"Recovery path is or will soon be available for {} coin(s).",
expiring_coins.len(),
))
.width(Length::Fill),

18
gui/src/app/view/psbt.rs
View File

@ -106,7 +106,7 @@ pub fn save_action<'a>(warning: Option<&Error>, saved: bool) -> Element<'a, Mess
Column::new()
.spacing(10)
.push_maybe(warning.map(|w| warn(Some(w))))
.push(text("Save the transaction as draft"))
.push(text("Save this transaction"))
.push(
Row::new()
.push(Column::new().width(Length::Fill))
@ -152,8 +152,8 @@ pub fn delete_action<'a>(warning: Option<&Error>, deleted: bool) -> Element<'a,
Column::new()
.spacing(20)
.align_items(Alignment::Center)
.push(text("Transaction is deleted"))
.push(button::primary(None, "Go back to drafts").on_press(Message::Close)),
.push(text("Successfully deleted this transaction."))
.push(button::primary(None, "Go back to PSBTs").on_press(Message::Close)),
)
.align_x(iced::alignment::Horizontal::Center)
.width(Length::Units(400))
@ -163,7 +163,7 @@ pub fn delete_action<'a>(warning: Option<&Error>, deleted: bool) -> Element<'a,
Column::new()
.spacing(10)
.push_maybe(warning.map(|w| warn(Some(w))))
.push(text("Delete the transaction draft"))
.push(text("Delete this PSBT"))
.push(
Row::new()
.push(Column::new().width(Length::Fill))
@ -188,7 +188,7 @@ pub fn spend_header<'a>(tx: &SpendTx) -> Element<'a, Message> {
.push(
Column::new()
.push(if tx.is_self_send() {
Container::new(h1("Self send"))
Container::new(h1("Send-to-self"))
} else {
Container::new(amount_with_size(&tx.spend_amount, H1_SIZE))
})
@ -377,9 +377,9 @@ pub fn signatures<'a>(
.padding(15)
.spacing(10)
.push(text(if !tx.sigs.recovery_paths().is_empty() {
"Multiple spending paths available. Finalizing this transaction requires either:"
"Multiple spending paths are available. Finalizing this transaction requires either:"
} else {
"1 spending path available. Finalizing this transaction requires:"
"1 spending path is available. Finalizing this transaction requires:"
}))
.push(path_view(
desc_info.primary_path(),
@ -511,7 +511,7 @@ pub fn inputs_and_outputs_view<'a>(
.align_items(Alignment::Center)
.push(
h4_bold(format!(
"{} spent coin{}",
"{} coin{} spent",
coins.len(),
if coins.len() == 1 { "" } else { "s" }
))
@ -529,7 +529,7 @@ pub fn inputs_and_outputs_view<'a>(
.align_items(Alignment::Center)
.push(
h4_bold(format!(
"{} spent coin{}",
"{} coin{} spent",
coins.len(),
if coins.len() == 1 { "" } else { "s" }
))

2
gui/src/app/view/psbts.rs
View File

@ -136,7 +136,7 @@ fn spend_tx_list_view<'a>(i: usize, tx: &SpendTx) -> Element<'a, Message> {
.push(if !tx.is_self_send() {
Container::new(amount(&tx.spend_amount))
} else {
Container::new(p1_regular("Self send"))
Container::new(p1_regular("Send-to-self"))
})
.push(amount_with_size(&tx.fee_amount, P2_SIZE))
.width(Length::Shrink),

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

@ -41,7 +41,7 @@ pub fn recovery<'a>(
Column::new()
.spacing(10)
.push(text(format!(
"{} recovery paths are available or will be available next block, select one:",
"{} recovery paths will be available at the next block, select one:",
recovery_paths.len()
)))
.push(Column::with_children(recovery_paths).spacing(10)),
@ -67,7 +67,7 @@ pub fn recovery<'a>(
)
.push(
Container::new(
form::Form::new("Feerate (sat/vbyte)", feerate, move |msg| {
form::Form::new("42 (sats/vbyte)", feerate, move |msg| {
Message::CreateSpend(CreateSpendMessage::FeerateEdited(msg))
})
.warning("Invalid feerate")

6
gui/src/app/view/settings.rs
View File

@ -428,9 +428,9 @@ pub fn rescan<'a>(
.push(
Row::new()
.push(badge::Badge::new(icon::block_icon()))
.push(text("Rescan blockchain").bold().width(Length::Fill))
.push(text("Blockchain rescan").bold().width(Length::Fill))
.push_maybe(if success {
Some(text("Rescan was successful").style(color::GREEN))
Some(text("Successfully rescanned the blockchain").style(color::GREEN))
} else {
None
})
@ -444,7 +444,7 @@ pub fn rescan<'a>(
Column::new()
.width(Length::Fill)
.push(ProgressBar::new(0.0..=1.0, p as f32).width(Length::Fill))
.push(text(format!("Rescan...{:.2}%", p * 100.0))),
.push(text(format!("Rescanning...{:.2}%", p * 100.0))),
)
} else {
Container::new(

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

@ -99,7 +99,7 @@ pub fn create_spend_tx<'a>(
cache,
error,
Column::new()
.push(h3(if is_self_send { "Self send" } else { "Send" }))
.push(h3(if is_self_send { "Send-to-self" } else { "Send" }))
.push(
Column::new()
.push(Column::with_children(recipients).spacing(10))
@ -134,10 +134,10 @@ pub fn create_spend_tx<'a>(
Row::new()
.push(
Row::new()
.push(Container::new(p1_bold("Fee rate")).padding(10))
.push(Container::new(p1_bold("Feerate")).padding(10))
.spacing(10)
.push(
form::Form::new("Feerate (sat/vbyte)", feerate, move |msg| {
form::Form::new("42 (in sats/vbyte)", feerate, move |msg| {
Message::CreateSpend(CreateSpendMessage::FeerateEdited(msg))
})
.warning("Invalid feerate")
@ -280,7 +280,7 @@ pub fn recipient_view<'a>(
.width(Length::Units(80)),
)
.push(
form::Form::new("ex: 0.001", amount, move |msg| {
form::Form::new("0.001 (in BTC)", amount, move |msg| {
CreateSpendMessage::RecipientEdited(index, "amount", msg)
})
.warning("Invalid amount. Must be > 0.00005000 BTC.")

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

@ -124,7 +124,7 @@ fn tx_list_view<'a>(i: usize, tx: &HistoryTransaction) -> Element<'a, Message> {
.push(amount(&tx.outgoing_amount))
.align_items(Alignment::Center)
} else {
Row::new().push(text("Self send"))
Row::new().push(text("Send-to-self"))
})
.align_items(Alignment::Center)
.spacing(20),
@ -158,7 +158,7 @@ pub fn tx_view<'a>(
Column::new().spacing(20).push(
Column::new()
.push(if tx.is_self_send() {
Container::new(h1("Self send"))
Container::new(h1("Send-to-self"))
} else if tx.is_external() {
Container::new(amount_with_size(&tx.incoming_amount, H1_SIZE))
} else {

4
gui/ui/src/component/badge.rs
View File

@ -97,7 +97,7 @@ pub fn deprecated<'a, T: 'a>() -> Container<'a, T> {
Container::new(text::p2_regular(" Deprecated "))
.padding(10)
.style(theme::Container::Pill(theme::Pill::Simple)),
"This spend cannot be included anymore in the blockchain",
"This transaction cannot be included in the blockchain anymore.",
tooltip::Position::Top,
)
.style(theme::Container::Card(theme::Card::Simple)),
@ -110,7 +110,7 @@ pub fn spent<'a, T: 'a>() -> Container<'a, T> {
Container::new(text::p2_regular(" Spent "))
.padding(10)
.style(theme::Container::Pill(theme::Pill::Simple)),
"The spend transaction was included in the blockchain",
"The transaction was included in the blockchain.",
tooltip::Position::Top,
)
.style(theme::Container::Card(theme::Card::Simple)),