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

Merge #952: gui: do not display hw error on simple user refusal

Browse Source 
3a30a36ce5f58e8ae2c92926384d76253e702894 gui: do not display hw error on simple user refusal (edouardparis)

Pull request description:

  close #937

ACKs for top commit:
  edouardparis:
    Self-ACK 3a30a36ce5f58e8ae2c92926384d76253e702894

Tree-SHA512: c2c1aed212b9389bac62da17552daa6d87d0eeea6180ec19e37dd9ef4dd0faa935a621123df6306ef9ca6fadffba35c1c047d2906a9c15db3a14cd8ccf156e29
This commit is contained in:
edouardparis 2024-02-02 11:54:57 +01:00
commit a88963cd77
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gui/src/app/state/psbt.rs
View File

@ -477,7 +477,11 @@ impl Action for SignAction {
Message::Signed(fingerprint, res) => { Message::Signed(fingerprint, res) => {
self.signing.remove(&fingerprint); self.signing.remove(&fingerprint);
match res { match res {
Err(e) => self.error = Some(e), Err(e) => {
if !matches!(e, Error::HardwareWallet(async_hwi::Error::UserRefused)) {
self.error = Some(e)
}
}
Ok(psbt) => { Ok(psbt) => {
self.error = None; self.error = None;
self.signed.insert(fingerprint); self.signed.insert(fingerprint);

6
gui/src/app/state/settings/wallet.rs
View File

@ -264,7 +264,11 @@ impl RegisterWalletModal {
self.registered.insert(fingerprint); self.registered.insert(fingerprint);
return Command::perform(async {}, |_| Message::LoadWallet); return Command::perform(async {}, |_| Message::LoadWallet);
} }
Err(e) => self.warning = Some(e), Err(e) => {
if !matches!(e, Error::HardwareWallet(async_hwi::Error::UserRefused)) {
self.warning = Some(e)
}
}
} }
Command::none() Command::none()
} }

6
gui/src/installer/step/descriptor.rs
View File

@ -1437,7 +1437,11 @@ impl Step for RegisterDescriptor {
self.hmacs.push((fingerprint, *hw_h.kind(), hmac)); self.hmacs.push((fingerprint, *hw_h.kind(), hmac));
} }
} }
Err(e) => self.error = Some(e), Err(e) => {
if !matches!(e, Error::HardwareWallet(async_hwi::Error::UserRefused)) {
self.error = Some(e)
}
}
} }
} }
Message::Reload => { Message::Reload => {