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

fix hw buttons: use secondary button

Browse Source
This commit is contained in:
edouardparis 2025-02-03 10:57:45 +01:00
parent 4fbef503e6
commit cfa7371969
3 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
liana-gui/src/app/view/hw.rs
View File

@ -69,7 +69,7 @@ pub fn hw_list_view(
kind, pairing_code, ..
} => hw::locked_hardware_wallet(kind, pairing_code.as_ref()),
})
.style(theme::button::container_border)
.style(theme::button::secondary)
.width(Length::Fill);
if !signing {
if let HardwareWallet::Supported { registered, .. } = hw {
@ -78,10 +78,7 @@ pub fn hw_list_view(
}
}
}
Container::new(bttn)
.width(Length::Fill)
.style(theme::card::simple)
.into()
bttn.into()
}
pub fn hw_list_view_for_registration(
@ -137,15 +134,12 @@ pub fn hw_list_view_for_registration(
kind, pairing_code, ..
} => hw::locked_hardware_wallet(kind, pairing_code.as_ref()),
})
.style(theme::button::container_border)
.style(theme::button::secondary)
.width(Length::Fill);
if !processing && hw.is_supported() {
bttn = bttn.on_press(Message::SelectHardwareWallet(i));
}
Container::new(bttn)
.width(Length::Fill)
.style(theme::card::simple)
.into()
bttn.into()
}
pub fn hw_list_view_verify_address(
@ -222,13 +216,10 @@ pub fn hw_list_view_verify_address(
),
};
let mut bttn = Button::new(content)
.style(theme::button::container_border)
.style(theme::button::secondary)
.width(Length::Fill);
if selectable && hw.is_supported() {
bttn = bttn.on_press(Message::SelectHardwareWallet(i));
}
Container::new(bttn)
.width(Length::Fill)
.style(theme::card::simple)
.into()
bttn.into()
}

2
liana-gui/src/app/view/psbt.rs
View File

@ -1050,7 +1050,7 @@ pub fn sign_action<'a>(
})
.on_press(Message::Spend(SpendTxMessage::SelectHotSigner))
.padding(10)
.style(theme::button::container_border)
.style(theme::button::secondary)
.width(Length::Fill)
}))
.width(Length::Fill),

18
liana-gui/src/installer/view/mod.rs
View File

@ -326,7 +326,7 @@ pub fn signer_xpubs<'a>(
)
.on_press(Message::UseHotSigner)
.padding(10)
.style(theme::button::transparent_border)
.style(theme::button::secondary)
.width(Length::Fill),
)
.push_maybe(if xpubs.is_empty() {
@ -1613,15 +1613,12 @@ pub fn hw_list_view(
kind, pairing_code, ..
} => hw::locked_hardware_wallet(kind, pairing_code.as_ref()),
})
.style(theme::button::container_border)
.style(theme::button::secondary)
.width(Length::Fill);
if !processing && hw.is_supported() {
bttn = bttn.on_press(Message::Select(i));
}
Container::new(bttn)
.width(Length::Fill)
.style(theme::card::simple)
.into()
bttn.into()
}
pub fn key_list_view<'a>(
@ -1633,7 +1630,7 @@ pub fn key_list_view<'a>(
chosen: bool,
device_must_support_taproot: bool,
) -> Element<'a, Message> {
let bttn = Button::new(if chosen {
Button::new(if chosen {
hw::selected_hardware_wallet(
kind.map(|k| k.to_string()).unwrap_or_default(),
version,
@ -1669,11 +1666,8 @@ pub fn key_list_view<'a>(
.width(Length::Fill)
.on_press(Message::DefineDescriptor(
message::DefineDescriptor::KeyModal(message::ImportKeyModal::SelectKey(i)),
));
Container::new(bttn)
.width(Length::Fill)
.style(theme::card::simple)
.into()
))
.into()
}
pub fn backup_mnemonic<'a>(