diff --git a/electrum/gui/qml/components/WalletDetails.qml b/electrum/gui/qml/components/WalletDetails.qml index 75f0ed59c..100ee77a9 100644 --- a/electrum/gui/qml/components/WalletDetails.qml +++ b/electrum/gui/qml/components/WalletDetails.qml @@ -404,6 +404,30 @@ Pane { width: parent.width columns: 2 + Label { + text: qsTr('Keystore type') + visible: modelData.keystore_type + color: Material.accentColor + } + Label { + Layout.fillWidth: true + text: modelData.keystore_type + visible: modelData.keystore_type + } + + Label { + text: modelData.watch_only + ? qsTr('Imported addresses') + : qsTr('Imported keys') + visible: modelData.num_imported + color: Material.accentColor + } + Label { + Layout.fillWidth: true + text: modelData.num_imported + visible: modelData.num_imported + } + Label { text: qsTr('Derivation prefix') visible: modelData.derivation_prefix @@ -438,6 +462,7 @@ Pane { Layout.fillWidth: true Layout.columnSpan: 2 Layout.leftMargin: constants.paddingLarge + visible: modelData.master_pubkey Label { text: modelData.master_pubkey wrapMode: Text.Wrap diff --git a/electrum/gui/qml/qewallet.py b/electrum/gui/qml/qewallet.py index c41627239..450d65c85 100644 --- a/electrum/gui/qml/qewallet.py +++ b/electrum/gui/qml/qewallet.py @@ -362,10 +362,12 @@ class QEWallet(AuthMixin, QObject, QtEventListener): result = [] for k in self.wallet.get_keystores(): result.append({ - 'derivation_prefix': k.get_derivation_prefix() or '', - 'master_pubkey': k.get_master_public_key() or '', - 'fingerprint': k.get_root_fingerprint() or '', - 'watch_only': k.is_watching_only() + 'keystore_type': k.type, + 'watch_only': k.is_watching_only(), + 'derivation_prefix': (k.get_derivation_prefix() if k.is_deterministic() else '') or '', + 'master_pubkey': (k.get_master_public_key() if k.is_deterministic() else '') or '', + 'fingerprint': (k.get_root_fingerprint() if k.is_deterministic() else '') or '', + 'num_imported': len(k.keypairs) if k.can_import() else 0, }) return result