From 30792feea446204f3e7cd4cdf9eb1a6dc5262ca9 Mon Sep 17 00:00:00 2001
From: Stepan Snigirev <snigirev.stepan@gmail.com>
Date: Mon, 13 Jul 2020 17:50:16 +0200
Subject: [PATCH 1/2] update keys table

---
 src/cryptoadvance/specter/key.py                        | 8 ++++++++
 src/cryptoadvance/specter/templates/device/device.jinja | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/cryptoadvance/specter/key.py b/src/cryptoadvance/specter/key.py
index 8a608c9c65..d8668f157c 100644
--- a/src/cryptoadvance/specter/key.py
+++ b/src/cryptoadvance/specter/key.py
@@ -165,6 +165,14 @@ def json(self):
     def purpose(self):
         return purposes[self.key_type]
 
+    def __str__(self):
+        if self.derivation and self.fingerprint:
+            return f"[{self.fingerprint}/{self.derivation[2:]}]{self.original}"
+        elif self.derivation:
+            return f"[{self.fingerprint}]{self.original}"
+        else:
+            return self.original
+
     def __eq__(self, other):
         return self.original == other.original
 
diff --git a/src/cryptoadvance/specter/templates/device/device.jinja b/src/cryptoadvance/specter/templates/device/device.jinja
index b6414cb040..0edbcc54d3 100644
--- a/src/cryptoadvance/specter/templates/device/device.jinja
+++ b/src/cryptoadvance/specter/templates/device/device.jinja
@@ -30,10 +30,10 @@
 						<td>{{ key.derivation }}</td>
 						<td width="10" class="qr-trigger">
 							<img src="/static/img/qr_tiny.svg"/>
-							<qr-code class="qr-popup" value="{{ 'name=' + device.name + '\n' + key.metadata['combined'] }}" width="200"></qr-code>
+							<qr-code class="qr-popup" value="{{key}}" width="200"></qr-code>
 						</td>
 						<td class="xpub scroll">
-							<span>{{ key.original }}</span>
+							<span class="explorer-link" onclick="copyText('{{ key }}', 'Copied key: {{ key }}')">{{ key }}</span>
 						</td>
 						<td width="80px">
 							<form action="./" method="POST">

From 43eb9f89d241d19002ff460393463b4609d51103 Mon Sep 17 00:00:00 2001
From: Stepan Snigirev <snigirev.stepan@gmail.com>
Date: Mon, 13 Jul 2020 19:00:18 +0200
Subject: [PATCH 2/2] remove prefix if derivation or fingerprint not available

---
 src/cryptoadvance/specter/key.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/cryptoadvance/specter/key.py b/src/cryptoadvance/specter/key.py
index d8668f157c..ce2e83bd77 100644
--- a/src/cryptoadvance/specter/key.py
+++ b/src/cryptoadvance/specter/key.py
@@ -168,8 +168,6 @@ def purpose(self):
     def __str__(self):
         if self.derivation and self.fingerprint:
             return f"[{self.fingerprint}/{self.derivation[2:]}]{self.original}"
-        elif self.derivation:
-            return f"[{self.fingerprint}]{self.original}"
         else:
             return self.original