From 37dab1bff29333e6f73616238d5e608975002ce7 Mon Sep 17 00:00:00 2001
From: pythcoiner <pythcoiner@proton.me>
Date: Mon, 4 Nov 2024 16:54:55 +0100
Subject: [PATCH] gui(installer): better warning if a signing device is not
 compatible w/ tapminiscript

---
 gui/src/installer/view/editor/template/custom.rs            | 4 ++--
 gui/src/installer/view/editor/template/inheritance.rs       | 4 ++--
 .../view/editor/template/multisig_security_wallet.rs        | 6 +++---
 gui/src/installer/view/mod.rs                               | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gui/src/installer/view/editor/template/custom.rs b/gui/src/installer/view/editor/template/custom.rs
index 30703929..338bfe60 100644
--- a/gui/src/installer/view/editor/template/custom.rs
+++ b/gui/src/installer/view/editor/template/custom.rs
@@ -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
                                             },
diff --git a/gui/src/installer/view/editor/template/inheritance.rs b/gui/src/installer/view/editor/template/inheritance.rs
index dddc76b6..aec07171 100644
--- a/gui/src/installer/view/editor/template/inheritance.rs
+++ b/gui/src/installer/view/editor/template/inheritance.rs
@@ -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
                             },
diff --git a/gui/src/installer/view/editor/template/multisig_security_wallet.rs b/gui/src/installer/view/editor/template/multisig_security_wallet.rs
index e675b5ca..ba86ba08 100644
--- a/gui/src/installer/view/editor/template/multisig_security_wallet.rs
+++ b/gui/src/installer/view/editor/template/multisig_security_wallet.rs
@@ -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
                                         },
diff --git a/gui/src/installer/view/mod.rs b/gui/src/installer/view/mod.rs
index 46949b21..a06ad6b4 100644
--- a/gui/src/installer/view/mod.rs
+++ b/gui/src/installer/view/mod.rs
@@ -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())
             }