fix launcher: wallet button

wizardsardine · Jan 31, 2025 · 0514b44 · 0514b44
1 parent b9467b3
commit 0514b44
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 38 deletions.
diff --git a/liana-gui/src/app/view/psbt.rs b/liana-gui/src/app/view/psbt.rs
@@ -421,16 +421,13 @@ pub fn signatures<'a>(
                             Row::new().spacing(5),
                             |row, value| {
                                 row.push(if let Some(alias) = keys_aliases.get(value) {
-                                    Container::new(
-                                        tooltip::Tooltip::new(
-                                            Container::new(text(alias))
-                                                .padding(10)
-                                                .style(theme::pill::simple),
-                                            text(value.to_string()),
-                                            tooltip::Position::Bottom,
-                                        )
-                                        .style(theme::card::simple),
-                                    )
+                                    Container::new(tooltip::Tooltip::new(
+                                        Container::new(text(alias))
+                                            .padding(10)
+                                            .style(theme::pill::simple),
+                                        text(value.to_string()),
+                                        tooltip::Position::Bottom,
+                                    ))
                                 } else {
                                     Container::new(text(value.to_string()))
                                         .padding(10)

diff --git a/liana-gui/src/launcher.rs b/liana-gui/src/launcher.rs
@@ -206,35 +206,45 @@ impl Launcher {
                                         .align_y(Alignment::Center)
                                         .spacing(20)
                                         .push(
-                                            Button::new(
-                                                Column::new()
-                                                    .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))
-                                                            .color(color::GREY_3)
-                                                    }))
-                                                    .push_maybe(email.as_ref().map(|email| {
-                                                        Row::new()
-                                                            .push(Space::with_width(Length::Fill))
-                                                            .push(
-                                                                p1_regular(email)
-                                                                    .color(color::GREEN),
-                                                            )
-                                                    })),
+                                            Container::new(
+                                                Button::new(
+                                                    Column::new()
+                                                        .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
+                                                                ))
+                                                                .color(color::GREY_3)
+                                                            },
+                                                        ))
+                                                        .push_maybe(email.as_ref().map(|email| {
+                                                            Row::new()
+                                                                .push(Space::with_width(
+                                                                    Length::Fill,
+                                                                ))
+                                                                .push(
+                                                                    p1_regular(email)
+                                                                        .color(color::GREEN),
+                                                                )
+                                                        })),
+                                                )
+                                                .on_press(ViewMessage::Run)
+                                                .padding(15)
+                                                .style(theme::button::container_border)
+                                                .width(Length::Fill),
                                             )
-                                            .on_press(ViewMessage::Run)
-                                            .style(theme::button::container_border)
-                                            .padding(10)
-                                            .width(Length::Fill),
+                                            .style(theme::card::simple),
                                         )
                                         .push(
                                             Button::new(icon::trash_icon())