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

fix bitbox unsupported status when no wallet yet

Browse Source 
During the install process, no wallet yet is created
and bitbox should not be marked as unsupported if
its fingerprint is not in any descriptor.
This commit is contained in:
edouardparis 2023-12-14 13:56:14 +01:00
parent b9cf62d71b
commit 1fa414be75
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gui/src/hw.rs
View File

@ -239,11 +239,27 @@ impl HardwareWallets {
bitbox2 = bitbox2.with_policy(&desc)?;
registered =
bitbox2.is_policy_registered(&desc).await?;
}
if wallet
.map(|w| w.descriptor_keys().contains(&fingerprint))
== Some(true)
{
if wallet.descriptor_keys().contains(&fingerprint) {
Ok(HardwareWallet::Supported {
id: id.clone(),
kind: DeviceKind::BitBox02,
fingerprint,
device: bitbox2.into(),
version: None,
registered: Some(registered),
alias: None,
})
} else {
Ok(HardwareWallet::Unsupported {
id: id.clone(),
kind: DeviceKind::BitBox02,
version: None,
reason: UnsupportedReason::NotPartOfWallet(
fingerprint,
),
})
}
} else {
Ok(HardwareWallet::Supported {
id: id.clone(),
kind: DeviceKind::BitBox02,
@ -253,15 +269,6 @@ impl HardwareWallets {
registered: Some(registered),
alias: None,
})
} else {
Ok(HardwareWallet::Unsupported {
id: id.clone(),
kind: DeviceKind::BitBox02,
version: None,
reason: UnsupportedReason::NotPartOfWallet(
fingerprint,
),
})
}
},
|res| HardwareWalletMessage::Unlocked(id_cloned, res),