electrum

commit f8c1bd1d3b1595cc2911170e68cb5bdcf95ea29b
parent 48d42bbafae88faf77e75efa804612c29e3df7ba
Author: ThomasV <thomasv@electrum.org>
Date:   Sat, 30 Jul 2016 08:19:29 +0200

wizard: multisig creation, let user go back to show their xpub

Diffstat:
M
lib/base_wizard.py
 | 
11
++++-------

1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/lib/base_wizard.py b/lib/base_wizard.py
@@ -232,14 +232,11 @@ class BaseWizard(object):
             self.storage.put('wallet_type', self.multisig_type)
             self.wallet = Multisig_Wallet(self.storage)
             self.wallet.add_cosigner('x1/', text, password)
-            self.run('show_xpub_and_add_cosigners', (Wallet.is_xpub(text), password,))
+            self.run('show_xpub_and_add_cosigners', (password,))
 
-    def show_xpub_and_add_cosigners(self, is_xpub, password):
-        if not is_xpub:
-            xpub = self.wallet.master_public_keys.get('x1/')
-            self.show_xpub_dialog(run_next=lambda x: self.add_cosigners(password), xpub=xpub)
-        else:
-            self.add_cosigners(password)
+    def show_xpub_and_add_cosigners(self, password):
+        xpub = self.wallet.master_public_keys.get('x1/')
+        self.show_xpub_dialog(xpub=xpub, run_next=lambda x: self.run('add_cosigners', (password,)))
 
     def add_cosigners(self, password):
         i = self.wallet.get_missing_cosigner()