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

gui: do not display hw error on simple user refusal

Browse Source 
close #937
This commit is contained in:
edouardparis 2024-02-02 11:32:39 +01:00
parent 445a8c1334
commit 3a30a36ce5
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 => {