From 2c79e618ce33120d63459d8be179c34807411bfc Mon Sep 17 00:00:00 2001 From: edouardparis Date: Wed, 4 Sep 2024 15:12:54 +0200 Subject: [PATCH 1/2] Use Liana Connect terminology --- gui/src/installer/view.rs | 8 ++++---- gui/src/lianalite/login.rs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gui/src/installer/view.rs b/gui/src/installer/view.rs index dab11718..cae776e0 100644 --- a/gui/src/installer/view.rs +++ b/gui/src/installer/view.rs @@ -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) -> 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) diff --git a/gui/src/lianalite/login.rs b/gui/src/lianalite/login.rs index 1e4d11c0..4c815f83 100644 --- a/gui/src/lianalite/login.rs +++ b/gui/src/lianalite/login.rs @@ -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) From d497c4dfe330b759cffe7f2e06b1a1fe90b58da1 Mon Sep 17 00:00:00 2001 From: edouardparis Date: Wed, 4 Sep 2024 16:03:09 +0200 Subject: [PATCH 2/2] Change name displayed in launcher --- gui/src/launcher.rs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/gui/src/launcher.rs b/gui/src/launcher.rs index 937237d4..c418bff2 100644 --- a/gui/src/launcher.rs +++ b/gui/src/launcher.rs @@ -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)