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

Merge #1054: gui: remove descriptor backup in installer when participating in new wallet

Browse Source 
52cbc3ee386973c12d002da3a688266994261312 gui: require valid network to proceed (jp1ac4)
2099866a60b5b9144bcb108ae17bfbb39d47fd90 gui: remove step to back up descriptor (jp1ac4)

Pull request description:

  This fixes #791 which is regarding the "Participate in new wallet" steps.

  The previous step requires the descriptor and so no need to back it up.

  I also fixed an issue where it was possible to click Next with an invalid network selected.

ACKs for top commit:
  edouardparis:
    ACK 52cbc3ee386973c12d002da3a688266994261312

Tree-SHA512: 762122b36260bca9e06b6971a941a91df23051affe1039ca74dc7c31ae96283f09f579fb4a8adbb71efe16bd4c64e96fbd5ae9f6dd3304addcaf142cdab3941b
This commit is contained in:
edouardparis 2024-04-15 14:42:47 +02:00
commit f8012daffc
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gui/src/installer/mod.rs
View File

@ -155,7 +155,6 @@ impl Installer {
ParticipateXpub::new(self.signer.clone()).into(), ParticipateXpub::new(self.signer.clone()).into(),
ImportDescriptor::new(false).into(), ImportDescriptor::new(false).into(),
BackupMnemonic::new(self.signer.clone()).into(), BackupMnemonic::new(self.signer.clone()).into(),
BackupDescriptor::default().into(),
RegisterDescriptor::new_import_wallet().into(), RegisterDescriptor::new_import_wallet().into(),
SelectBitcoindTypeStep::new().into(), SelectBitcoindTypeStep::new().into(),
InternalBitcoindStep::new(&self.context.data_dir).into(), InternalBitcoindStep::new(&self.context.data_dir).into(),

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

@ -721,7 +721,7 @@ pub fn participate_xpub<'a>(
shared, shared,
Message::UserActionDone, Message::UserActionDone,
)) ))
.push(if shared { .push(if shared && network_valid {
button::primary(None, "Next") button::primary(None, "Next")
.width(Length::Fixed(200.0)) .width(Length::Fixed(200.0))
.on_press(Message::Next) .on_press(Message::Next)