AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: check passphrase not empty when checked

Browse Source
This commit is contained in:
Sander van Grieken
2023-08-01 14:33:04 +02:00
parent a6caa3ffe9
commit a6aff1ec07
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/gui/qml/components/wizard/WCCreateSeed.qml
View File

@@ -9,7 +9,7 @@ import "../controls"
WizardComponent { WizardComponent {
securePage: true securePage: true
valid: seedtext.text != '' valid: seedtext.text != '' && extendcb.checked ? customwordstext.text != '' : true
function apply() { function apply() {
wizard_data['seed'] = seedtext.text wizard_data['seed'] = seedtext.text

3
electrum/gui/qml/components/wizard/WCHaveSeed.qml
View File

@@ -68,6 +68,9 @@ WizardComponent {
valid = false valid = false
validationtext.text = '' validationtext.text = ''
if (extendcb.checked && customwordstext.text == '')
return
var validSeed = bitcoin.verifySeed(seedtext.text, seed_variant_cb.currentValue, wizard_data['wallet_type']) var validSeed = bitcoin.verifySeed(seedtext.text, seed_variant_cb.currentValue, wizard_data['wallet_type'])
if (!cosigner || !validSeed) { if (!cosigner || !validSeed) {
valid = validSeed valid = validSeed

0
electrum/gui/qml/components/wizard/WCBIP39Refine.qml → electrum/gui/qml/components/wizard/WCScriptAndDerivation.qml
View File

2
electrum/gui/qml/qewizard.py
View File

@@ -58,7 +58,7 @@ class QENewWalletWizard(NewWalletWizard, QEAbstractWizard):
'create_seed': { 'gui': 'WCCreateSeed' }, 'create_seed': { 'gui': 'WCCreateSeed' },
'confirm_seed': { 'gui': 'WCConfirmSeed' }, 'confirm_seed': { 'gui': 'WCConfirmSeed' },
'have_seed': { 'gui': 'WCHaveSeed' }, 'have_seed': { 'gui': 'WCHaveSeed' },
'script_and_derivation': { 'gui': 'WCBIP39Refine' }, 'script_and_derivation': { 'gui': 'WCScriptAndDerivation' },
'have_master_key': { 'gui': 'WCHaveMasterKey' }, 'have_master_key': { 'gui': 'WCHaveMasterKey' },
'multisig': { 'gui': 'WCMultisig' }, 'multisig': { 'gui': 'WCMultisig' },
'multisig_cosigner_keystore': { 'gui': 'WCCosignerKeystore' }, 'multisig_cosigner_keystore': { 'gui': 'WCCosignerKeystore' },