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

Merge #1262: Change remote backend wording

Browse Source 
d497c4dfe330b759cffe7f2e06b1a1fe90b58da1 Change name displayed in launcher (edouardparis)
2c79e618ce33120d63459d8be179c34807411bfc Use Liana Connect terminology (edouardparis)

Pull request description:

  ![20240904_16h27m37s_grim](https://github.com/user-attachments/assets/066dfcdb-df75-4457-826f-92bf75f61a9e)
  ![20240904_16h28m01s_grim](https://github.com/user-attachments/assets/cd983c09-cdd8-4f2b-805b-aac85390c79b)

  discussed in #1240 and discord

ACKs for top commit:
  edouardparis:
    Self-ACK d497c4dfe330b759cffe7f2e06b1a1fe90b58da1

Tree-SHA512: 49e61b47e1eb13dbde3195819f845ae715d3ee2b6f84136c5ace53a77fef8b6fda4a05c940d6c6d7e0148690c1ce87bbc8e166d31aa6d710216a8379a938000a
This commit is contained in:
edouardparis 2024-09-04 17:19:31 +02:00
commit e11529be56
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ use liana_ui::{
color,
component::{
button, card, collapse, form, hw, separation,
text::{h3, h4_bold, h5_regular, p1_regular, text, Text},
text::{h2, h3, h4_bold, h5_regular, p1_regular, text, Text},
tooltip,
},
icon, image, theme,
@ -2271,14 +2271,14 @@ pub fn choose_backend(progress: (usize, usize)) -> Element<'static, Message> {
Column::new()
.spacing(20)
.width(Length::FillPortion(1))
.push(image::liana_brand_grey().height(Length::Fixed(100.0)))
.push(h3("Use your own node"))
.push(text::p2_medium(LOCAL_WALLET_DESC).style(color::GREY_3)),
)
.push(
Column::new()
.spacing(20)
.width(Length::FillPortion(1))
.push(image::wizardsardine().height(Length::Fixed(100.0)))
.push(h3("Use Liana Connect"))
.push(text::p2_medium(REMOTE_BACKEND_DESC).style(color::GREY_3)),
),
)
@ -2323,7 +2323,7 @@ pub fn login(progress: (usize, usize), connection_step: Element<Message>) -> Ele
.max_width(700)
.align_items(Alignment::Center)
.width(Length::FillPortion(1))
.push(image::wizardsardine().height(Length::Fixed(100.0)))
.push(h2("Liana Connect"))
.push(connection_step),
)
.width(Length::Fill)

19
gui/src/launcher.rs
View File

@ -199,9 +199,7 @@ impl Launcher {
.push(match &self.state {
State::Unchecked => Column::new(),
State::Wallet {
name,
email,
checksum,
email, checksum, ..
} => Column::new().push(
Row::new()
.align_items(Alignment::Center)
@ -209,11 +207,16 @@ impl Launcher {
.push(
Button::new(
Column::new()
.push(p1_bold(if let Some(name) = name {
name
} else {
"Wallet"
}))
.push(p1_bold(format!(
"My Liana {} wallet",
match self.network {
Network::Bitcoin => "Bitcoin",
Network::Signet => "Signet",
Network::Testnet => "Testnet",
Network::Regtest => "Regtest",
_ => "",
}
)))
.push_maybe(checksum.as_ref().map(|checksum| {
p1_regular(format!("Liana-{}", checksum))
.style(color::GREY_3)

4
gui/src/lianalite/login.rs
View File

@ -6,7 +6,7 @@ use liana::miniscript::bitcoin::Network;
use liana_ui::{
color,
component::{button, form, network_banner, notification, text::*},
icon, image,
icon,
widget::*,
};
@ -380,7 +380,7 @@ impl LianaLiteLogin {
.align_items(Alignment::Center)
.spacing(20)
.width(Length::Fill)
.push(image::wizardsardine().height(Length::Fixed(100.0)))
.push(h2("Liana Connect"))
.push(
Column::new()
.max_width(500)