AaronFiore/electrum
1
0
Fork 0
Code Activity

One can now click the back button in the show_xpub_and_add_cosigners wizard step

Browse Source
This commit is contained in:
relativistic electron
2020-05-06 22:34:59 +02:00
committed by ThomasV
parent 984da7515a
commit fbc539e2cc
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electrum/base_wizard.py
View File

@@ -546,12 +546,12 @@ class BaseWizard(Logger):
self.show_error(_('Cannot add this cosigner:') + '\n' + "Their key type is '%s', we are '%s'"%(t1, t2)) self.show_error(_('Cannot add this cosigner:') + '\n' + "Their key type is '%s', we are '%s'"%(t1, t2))
self.run('choose_keystore') self.run('choose_keystore')
return return
self.keystores.append(k) if len(self.keystores) == 0:
if len(self.keystores) == 1:
xpub = k.get_master_public_key() xpub = k.get_master_public_key()
self.reset_stack()
self.run('show_xpub_and_add_cosigners', xpub) self.run('show_xpub_and_add_cosigners', xpub)
elif len(self.keystores) < self.n: self.reset_stack()
self.keystores.append(k)
if len(self.keystores) < self.n:
self.run('choose_keystore') self.run('choose_keystore')
else: else:
self.run('create_wallet') self.run('create_wallet')
@@ -641,7 +641,7 @@ class BaseWizard(Logger):
raise NotImplementedError() # implemented by subclasses raise NotImplementedError() # implemented by subclasses
def show_xpub_and_add_cosigners(self, xpub): def show_xpub_and_add_cosigners(self, xpub):
self.show_xpub_dialog(xpub=xpub, run_next=lambda x: self.run('choose_keystore')) self.show_xpub_dialog(xpub=xpub, run_next=lambda x: None)
def choose_seed_type(self, message=None, choices=None): def choose_seed_type(self, message=None, choices=None):
title = _('Choose Seed type') title = _('Choose Seed type')