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

Merge #496: gui: minor fixes and wording change

Browse Source 
98c7d54ae059eb6542d327142692c2df5c769729 gui: increase scrollable width (edouard)
916e47539523357972dd308290543f77dcc0145d change install registration text (edouard)

Pull request description:

ACKs for top commit:
  edouardparis:
    Self-ACK 98c7d54ae059eb6542d327142692c2df5c769729

Tree-SHA512: b5b47f2abba46a9d8990898d4f3f0013a51dda7d7aa6f1945625342b61d1bd8d3b9bad528aa932bff88379d6ee8232df51951b1e3c6a82d2b2c2a71789c540b9
This commit is contained in:
edouard 2023-05-11 14:30:28 +02:00
commit 2a840b3ba1
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gui/src/app/view/settings.rs
View File

@ -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(

2
gui/src/installer/prompt.rs
View File

@ -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.";

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

@ -453,7 +453,7 @@ pub fn signer_xpubs(xpubs: &Vec<String>) -> Element<Message> {
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))),