AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #9300 from accumulator/gui_hint_multisig_watchonly

Browse Source 
wizard: hint for primary signer xpub instead of xprv
This commit is contained in:
ThomasV
2024-11-14 10:53:14 +01:00
committed by GitHub
parent fef6fc54c9 7ee863f225
commit 2d86a6177e
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/gui/qml/components/wizard/WCHaveMasterKey.qml
View File

@@ -116,8 +116,12 @@ WizardComponent {
Label {
Layout.fillWidth: true
text: cosigner
? qsTr('Enter cosigner master public key')
: qsTr('Create keystore from a master key')
? [qsTr('Please enter the master public key (xpub) of your cosigner.'),
qsTr('Enter their master private key (xprv) if you want to be able to sign for them.')
].join('\n')
: [qsTr('Please enter your master private key (xprv).'),
qsTr('You can also enter a public key (xpub) here, but be aware you will then create a watch-only wallet if all cosigners are added using public keys')
].join('\n')
wrapMode: Text.Wrap
}

6
electrum/gui/qt/wizard/wallet.py
View File

@@ -819,6 +819,10 @@ class WCHaveMasterKey(WalletWizardComponent):
_("To create a watching-only wallet, please enter your master public key (xpub/ypub/zpub)."),
_("To create a spending wallet, please enter a master private key (xprv/yprv/zprv).")
])
self.message_multisig = ' '.join([
_('Please enter your master private key (xprv).'),
_('You can also enter a public key (xpub) here, but be aware you will then create a watch-only wallet if all cosigners are added using public keys'),
])
self.message_cosign = ' '.join([
_('Please enter the master public key (xpub) of your cosigner.'),
_('Enter their master private key (xprv) if you want to be able to sign for them.')
@@ -846,7 +850,7 @@ class WCHaveMasterKey(WalletWizardComponent):
self.title = _("Add Cosigner {}").format(self.wizard_data['multisig_current_cosigner'])
self.label.setText(self.message_cosign)
else:
self.label.setText(self.message_create)
self.label.setText(self.message_multisig)
def is_valid(x) -> bool:
self.apply()