From 780408285cc1e8b871bead0c0691b1ae2f921e67 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Fri, 3 Jun 2022 18:02:58 +0200 Subject: [PATCH] qt "Wallet Info" dialog: show bip32 root fingerprint and also show it in DeviceMgr.select_device follow-up https://github.com/spesmilo/electrum/commit/998cd0d356fcd9ed1bd835c3a1abe81737a8b73b --- electrum/gui/qt/main_window.py | 15 +++++++++++---- electrum/plugin.py | 6 ++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/electrum/gui/qt/main_window.py b/electrum/gui/qt/main_window.py index 56272635f..795b96232 100644 --- a/electrum/gui/qt/main_window.py +++ b/electrum/gui/qt/main_window.py @@ -2817,20 +2817,27 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger): mpk_text.setMaximumHeight(150) mpk_text.addCopyButton() run_hook('show_xpub_button', mpk_text, ks) + ks_vbox.addWidget(WWLabel(_("Master Public Key"))) + ks_vbox.addWidget(mpk_text) der_path_hbox = QHBoxLayout() der_path_hbox.setContentsMargins(0, 0, 0, 0) - der_path_hbox.addWidget(WWLabel(_("Derivation path") + ':')) der_path_text = WWLabel(ks.get_derivation_prefix() or _("unknown")) der_path_text.setTextInteractionFlags(Qt.TextSelectableByMouse) der_path_hbox.addWidget(der_path_text) der_path_hbox.addStretch() - - ks_vbox.addWidget(WWLabel(_("Master Public Key"))) - ks_vbox.addWidget(mpk_text) ks_vbox.addLayout(der_path_hbox) + bip32fp_hbox = QHBoxLayout() + bip32fp_hbox.setContentsMargins(0, 0, 0, 0) + bip32fp_hbox.addWidget(QLabel("BIP32 root fingerprint:")) + bip32fp_text = WWLabel(ks.get_root_fingerprint() or _("unknown")) + bip32fp_text.setTextInteractionFlags(Qt.TextSelectableByMouse) + bip32fp_hbox.addWidget(bip32fp_text) + bip32fp_hbox.addStretch() + ks_vbox.addLayout(bip32fp_hbox) + ks_stack.addWidget(ks_w) select_ks(0) diff --git a/electrum/plugin.py b/electrum/plugin.py index af2e96762..4ddf150fb 100644 --- a/electrum/plugin.py +++ b/electrum/plugin.py @@ -632,9 +632,11 @@ class DeviceMgr(ThreadJob): if not allow_user_interaction: raise CannotAutoSelectDevice() msg = _('Please insert your {}').format(plugin.device) + msg += " (" if keystore.label and keystore.label not in PLACEHOLDER_HW_CLIENT_LABELS: - msg += ' ({})'.format(keystore.label) - msg += '. {}\n\n{}'.format( + msg += f"label: {keystore.label}, " + msg += f"bip32 root fingerprint: {keystore.get_root_fingerprint()!r}" + msg += ').\n\n{}\n\n{}'.format( _('Verify the cable is connected and that ' 'no other application is using it.'), _('Try to connect again?')