Skip to content

Commit

Permalink
Merge #828: gui: installer: clearer placeholder in xpub edit field
Browse files Browse the repository at this point in the history
3077062 gui: installer: clearer placeholder in xpub edit field (Antoine Poinsot)

Pull request description:

  I'm not sure what rustfmt is doing here.

  Fixes #451.

ACKs for top commit:
  pythcoiner:
    utACK 3077062
  edouardparis:
    utACK 3077062

Tree-SHA512: 79637d3c147c19ff5b7a4758da62089e51990d611e992591b2368f2e3135c06c547804d75c0bf3e5394843e29d582edb71487039a23fdae507cc6c6eae28ec36
  • Loading branch information
darosior committed Dec 4, 2023
2 parents 7011210 + 3077062 commit bcfab48
Showing 1 changed file with 14 additions and 7 deletions.
21 changes: 14 additions & 7 deletions gui/src/installer/view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1320,13 +1320,20 @@ pub fn edit_key_modal<'a>(
.push(
Row::new()
.push(
form::Form::new_trimmed("Extended public key", form_xpub, |msg| {
Message::DefineDescriptor(
message::DefineDescriptor::KeyModal(
message::ImportKeyModal::XPubEdited(msg),
),
)
})
form::Form::new_trimmed(
&format!(
"[aabbccdd/42'/0']{}pub6DAkq8LWw91WGgUGnkR5Sbzjev5JCsXaTVZQ9MwsPV4BkNFKygtJ8GHodfDVx1udR723nT7JASqGPpKvz7zQ25pUTW6zVEBdiWoaC4aUqik",
if network == bitcoin::Network::Bitcoin {
"x"
} else {
"t"
}
),
form_xpub, |msg| {
Message::DefineDescriptor(
message::DefineDescriptor::KeyModal(
message::ImportKeyModal::XPubEdited(msg),),)
})
.warning(if network == bitcoin::Network::Bitcoin {
"Please enter correct xpub with origin and without appended derivation path"
} else {
Expand Down

0 comments on commit bcfab48

Please sign in to comment.