tkivy: fix confirm_seed_dialog (broken in 77e0d3745e990e97ddbac5550e399f3e695af788) - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 620a6aaf990f7dce07c3cd7ae87c4c1c9f70d505
DIR parent 3cb68b10b94abd6cd8ca9442b6f9ef5773f88557
HTML Author: ThomasV <thomasv@electrum.org>
Date: Wed, 13 Jan 2021 11:07:48 +0100
kivy: fix confirm_seed_dialog (broken in 77e0d3745e990e97ddbac5550e399f3e695af788)
Diffstat:
M electrum/base_wizard.py | 1 +
M electrum/gui/kivy/uix/dialogs/inst… | 11 +++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
---
DIR diff --git a/electrum/base_wizard.py b/electrum/base_wizard.py
t@@ -694,6 +694,7 @@ class BaseWizard(Logger):
self.seed_type = seed_type
seed = mnemonic.Mnemonic('en').make_seed(seed_type=self.seed_type)
self.opt_bip39 = False
+ self.opt_ext = True
f = lambda x: self.request_passphrase(seed, x)
self.show_seed_dialog(run_next=f, seed_text=seed)
DIR diff --git a/electrum/gui/kivy/uix/dialogs/installwizard.py b/electrum/gui/kivy/uix/dialogs/installwizard.py
t@@ -835,11 +835,12 @@ class ChoiceLineDialog(WizardChoiceDialog):
class ShowSeedDialog(WizardDialog):
seed_text = StringProperty('')
message = _("If you forget your PIN or lose your device, your seed phrase will be the only way to recover your funds.")
- ext = False
def __init__(self, wizard, **kwargs):
super(ShowSeedDialog, self).__init__(wizard, **kwargs)
self.seed_text = kwargs['seed_text']
+ self.opt_ext = True
+ self.is_ext = False
def on_parent(self, instance, value):
if value:
t@@ -848,12 +849,12 @@ class ShowSeedDialog(WizardDialog):
def options_dialog(self):
from .seed_options import SeedOptionsDialog
def callback(ext, _):
- self.ext = ext
- d = SeedOptionsDialog(self.ext, None, callback)
+ self.is_ext = ext
+ d = SeedOptionsDialog(self.opt_ext, False, self.is_ext, False, callback)
d.open()
def get_params(self, b):
- return (self.ext,)
+ return (self.is_ext,)
class WordButton(Button):
t@@ -1099,6 +1100,8 @@ class InstallWizard(BaseWizard, Widget):
def confirm_seed_dialog(self, **kwargs):
kwargs['title'] = _('Confirm Seed')
kwargs['message'] = _('Please retype your seed phrase, to confirm that you properly saved it')
+ kwargs['opt_bip39'] = self.opt_bip39
+ kwargs['opt_ext'] = self.opt_ext
ConfirmSeedDialog(self, **kwargs).open()
def restore_seed_dialog(self, **kwargs):