From 916e47539523357972dd308290543f77dcc0145d Mon Sep 17 00:00:00 2001 From: edouard Date: Thu, 11 May 2023 13:26:13 +0200 Subject: [PATCH 1/2] change install registration text --- gui/src/installer/prompt.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/src/installer/prompt.rs b/gui/src/installer/prompt.rs index 64b00599..3af197f6 100644 --- a/gui/src/installer/prompt.rs +++ b/gui/src/installer/prompt.rs @@ -6,6 +6,6 @@ pub const DEFINE_DESCRIPTOR_RECOVERY_PATH_TOOLTIP: &str = "Set key(s) that can be used to spend coins after a defined period of time.\n Different sets of keys can be set to become available at different times."; pub const DEFINE_DESCRIPTOR_FINGERPRINT_TOOLTIP: &str = "The alias is applied on all the keys derived from the same seed"; -pub const REGISTER_DESCRIPTOR_HELP: &str = "To be used with the wallet, a device needs the descriptor. If the descriptor contains one or more keys imported from an external signing device, the descriptor must be registered on it. Registration on a device is not a substitute for backing up the descriptor."; +pub const REGISTER_DESCRIPTOR_HELP: &str = "To be used with the wallet, a device needs the descriptor. If the descriptor contains one or more keys imported from an external signing device, the descriptor must be registered on it. Registration confirms that the device is able to handle the policy. Registration on a device is not a substitute for backing up the descriptor."; pub const MNEMONIC_HELP: &str = "A hot key generated on this computer was used for creating this wallet. It needs to be backed up. \n Keep it in a safe place. Never share it with anyone."; pub const RECOVER_MNEMONIC_HELP: &str = "If you were using a hot key (a key stored on the computer) in your wallet, you will need to recover it from mnemonics to be able to sign transactions again. Otherwise you can directly go the next step."; From 98c7d54ae059eb6542d327142692c2df5c769729 Mon Sep 17 00:00:00 2001 From: edouard Date: Thu, 11 May 2023 13:39:31 +0200 Subject: [PATCH 2/2] gui: increase scrollable width --- gui/src/app/view/settings.rs | 9 +++++++-- gui/src/installer/view.rs | 12 ++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/gui/src/app/view/settings.rs b/gui/src/app/view/settings.rs index 14a18061..a2641368 100644 --- a/gui/src/app/view/settings.rs +++ b/gui/src/app/view/settings.rs @@ -565,8 +565,13 @@ pub fn wallet_settings<'a>( Column::new() .push(text("Wallet descriptor:").bold()) .push( - scrollable(text(descriptor.to_owned()).small()).horizontal_scroll( - scrollable::Properties::new().width(2).scroller_width(2), + scrollable( + Column::new() + .push(text(descriptor.to_owned()).small()) + .push(Space::with_height(Length::Units(5))), + ) + .horizontal_scroll( + scrollable::Properties::new().width(5).scroller_width(5), ), ) .push( diff --git a/gui/src/installer/view.rs b/gui/src/installer/view.rs index bceca6a5..48361372 100644 --- a/gui/src/installer/view.rs +++ b/gui/src/installer/view.rs @@ -453,7 +453,7 @@ pub fn signer_xpubs(xpubs: &Vec) -> Element { Container::new( scrollable(Container::new(text(xpub).small()).padding(10)) .horizontal_scroll( - Properties::new().width(2).scroller_width(2), + Properties::new().width(5).scroller_width(5), ), ) .width(Length::Fill), @@ -536,7 +536,7 @@ pub fn hardware_wallet_xpubs<'a>( Container::new( scrollable(Container::new(text(xpub).small()).padding(10)) .horizontal_scroll( - Properties::new().width(2).scroller_width(2), + Properties::new().width(5).scroller_width(5), ), ) .width(Length::Fill), @@ -1161,8 +1161,12 @@ pub fn defined_descriptor_key( .spacing(10) .align_items(Alignment::Center) .push( - scrollable(text(name).bold()) - .horizontal_scroll(Properties::new().width(2).scroller_width(2)), + scrollable( + Column::new() + .push(text(name).bold()) + .push(Space::with_height(Length::Units(5))), + ) + .horizontal_scroll(Properties::new().width(5).scroller_width(5)), ) .push(image::success_mark_icon().width(Length::Units(50))) .push(Space::with_width(Length::Units(1))),