From b33e6a8b687580e5800a1143c31c8a3fd4879016 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Tue, 30 Aug 2016 10:36:51 +0200
Subject: [PATCH] wizard small fixes

---
 lib/base_wizard.py                 | 6 ++----
 plugins/trustedcoin/trustedcoin.py | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/base_wizard.py b/lib/base_wizard.py
index 774fefa7..3c0c6fc4 100644
--- a/lib/base_wizard.py
+++ b/lib/base_wizard.py
@@ -242,7 +242,6 @@ class BaseWizard(object):
 
     def restore_from_seed(self):
         self.opt_bip39 = True
-        self.opt_ext = True
         self.restore_seed_dialog(run_next=self.on_restore_seed, test=keystore.is_seed)
 
     def on_restore_seed(self, seed, is_bip39):
@@ -329,7 +328,6 @@ class BaseWizard(object):
         from electrum.mnemonic import Mnemonic
         seed = Mnemonic('en').make_seed()
         self.opt_bip39 = False
-        self.opt_ext = True
         self.show_seed_dialog(run_next=self.request_passphrase, seed_text=seed)
 
     def request_passphrase(self, seed):
@@ -347,16 +345,16 @@ class BaseWizard(object):
         self.confirm_seed_dialog(run_next=f, test=lambda x: x==seed)
 
     def confirm_passphrase(self, seed, passphrase):
+        f = lambda x: self.run('create_keystore', seed, x)
         if passphrase:
             title = _('Confirm Passphrase')
             message = '\n'.join([
                 _('Your passphrase must be saved with your seed.'),
                 _('Please type it here.'),
             ])
-            f = lambda x: self.create_keystore(seed, x)
             self.line_dialog(run_next=f, title=title, message=message, default='', test=lambda x: x==passphrase)
         else:
-            self.create_keystore(seed, '')
+            f('')
 
     def create_addresses(self):
         def task():
diff --git a/plugins/trustedcoin/trustedcoin.py b/plugins/trustedcoin/trustedcoin.py
index a1b6012c..8b4cc441 100644
--- a/plugins/trustedcoin/trustedcoin.py
+++ b/plugins/trustedcoin/trustedcoin.py
@@ -352,7 +352,8 @@ class TrustedCoinPlugin(BasePlugin):
 
     def create_seed(self, wizard):
         seed = self.make_seed()
-        wizard.show_seed_dialog(run_next=wizard.confirm_seed, seed_text=seed)
+        f = lambda x: wizard.confirm_seed(seed, '')
+        wizard.show_seed_dialog(run_next=f, seed_text=seed)
 
     def create_keystore(self, wizard, seed, passphrase):
         assert passphrase == ''