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

gui(installer): better warning if a signing device is not compatible w/ tapminiscript

Browse Source
This commit is contained in:
pythcoiner 2024-11-04 16:54:55 +01:00
parent 01f6d2b769
commit 37dab1bff2
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/src/installer/view/editor/template/custom.rs
View File

@ -115,7 +115,7 @@ pub fn custom_template<'a>(
color::GREEN,
"Primary key",
if use_taproot && !key.is_compatible_taproot {
Some("Key is not compatible with taproot")
Some("This device does not support Taproot")
} else {
None
},
@ -157,7 +157,7 @@ pub fn custom_template<'a>(
color::ORANGE,
"Recovery key",
if use_taproot && !key.is_compatible_taproot {
Some("Key is not compatible with Taproot")
Some("This device does not support Taproot")
} else {
None
},

4
gui/src/installer/view/editor/template/inheritance.rs
View File

@ -114,7 +114,7 @@ pub fn inheritance_template<'a>(
color::GREEN,
"Primary key",
if use_taproot && !key.is_compatible_taproot {
Some("Key is not compatible with Taproot")
Some("This device does not support Taproot")
} else {
None
},
@ -141,7 +141,7 @@ pub fn inheritance_template<'a>(
color::WHITE,
"Inheritance key",
if use_taproot && !key.is_compatible_taproot {
Some("Key is not compatible with taproot")
Some("This device does not support Taproot")
} else {
None
},

6
gui/src/installer/view/editor/template/multisig_security_wallet.rs
View File

@ -129,7 +129,7 @@ pub fn multisig_security_template<'a>(
color::GREEN,
format!("Primary key #{}", i + 1),
if use_taproot && !key.is_compatible_taproot {
Some("Key is not compatible with taproot")
Some("This device does not support Taproot")
} else {
None
},
@ -177,7 +177,7 @@ pub fn multisig_security_template<'a>(
color::GREEN,
format!("Primary key #{}", j + 1),
if use_taproot && !key.is_compatible_taproot {
Some("Key is not compatible with Taproot")
Some("This device does not support Taproot")
} else {
None
},
@ -188,7 +188,7 @@ pub fn multisig_security_template<'a>(
color::ORANGE,
"Recovery key".to_string(),
if use_taproot && !key.is_compatible_taproot {
Some("Key is not compatible with Taproot")
Some("This device does not support Taproot")
} else {
None
},

4
gui/src/installer/view/mod.rs
View File

@ -1559,8 +1559,6 @@ pub fn hw_list_view(
} => {
if chosen && processing {
hw::processing_hardware_wallet(kind, version.as_ref(), fingerprint, alias.as_ref())
} else if selected {
hw::selected_hardware_wallet(kind, version.as_ref(), fingerprint, alias.as_ref())
} else if device_must_support_taproot
&& !is_compatible_with_tapminiscript(kind, version.as_ref())
{
@ -1571,6 +1569,8 @@ pub fn hw_list_view(
alias.as_ref(),
"Device firmware version does not support taproot miniscript",
)
} else if selected {
hw::selected_hardware_wallet(kind, version.as_ref(), fingerprint, alias.as_ref())
} else {
hw::supported_hardware_wallet(kind, version.as_ref(), fingerprint, alias.as_ref())
}