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

Merge #1430: gui(installer): better warn. if a signer is not compatible w/ tapminiscript

Browse Source 
37dab1bff29333e6f73616238d5e608975002ce7 gui(installer): better warning if a signing device is not compatible w/ tapminiscript (pythcoiner)

Pull request description:

  - replace this warning:
  ![image](https://github.com/user-attachments/assets/113f9608-a695-4389-8c53-f0da40fcb04f)
  by this one:
  ![image](https://github.com/user-attachments/assets/da666783-88ef-466c-a16a-5619c122d687)

  - before if a non tap miniscript compatible device was selected, the selected icon was displayed, now the warning icon have priority:
  ![image](https://github.com/user-attachments/assets/54b0e44e-c169-4aa0-b45d-7609b735cee2)

ACKs for top commit:
  edouardparis:
    utACK 37dab1bff29333e6f73616238d5e608975002ce7

Tree-SHA512: 5b23cf097618ea19adde4477319c431308946a46d9c92d898da62c16b3a27977cb5ac7b27e802ac4ef85c94ebc610c4621a26ceace78f94fb0e26558b9f389ca
This commit is contained in:
edouardparis 2024-11-04 17:46:15 +01:00
commit 103651ec7f
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
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

@ -116,7 +116,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
},
@ -158,7 +158,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

@ -115,7 +115,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
},
@ -142,7 +142,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

@ -130,7 +130,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
},
@ -178,7 +178,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
},
@ -189,7 +189,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

@ -1560,8 +1560,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())
{
@ -1572,6 +1570,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())
}