From fbc539e2cc0c6c679aba8adafa234a4947aa70d1 Mon Sep 17 00:00:00 2001 From: relativistic electron Date: Wed, 6 May 2020 22:34:59 +0200 Subject: [PATCH] One can now click the back button in the show_xpub_and_add_cosigners wizard step --- electrum/base_wizard.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/electrum/base_wizard.py b/electrum/base_wizard.py index 9144a9ace..58f58f45f 100644 --- a/electrum/base_wizard.py +++ b/electrum/base_wizard.py @@ -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.run('choose_keystore') return - self.keystores.append(k) - if len(self.keystores) == 1: + if len(self.keystores) == 0: xpub = k.get_master_public_key() - self.reset_stack() 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') else: self.run('create_wallet') @@ -641,7 +641,7 @@ class BaseWizard(Logger): raise NotImplementedError() # implemented by subclasses 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): title = _('Choose Seed type')