AaronFiore/electrum
1
0
Fork 0
Code Activity

wizard: take hardware_device from correct location for cosigners. fixes #8808

Browse Source
This commit is contained in:
Sander van Grieken
2024-01-16 11:45:20 +01:00
parent 2b3d7096c6
commit 82c21bc30d
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/gui/qt/wizard/wallet.py
View File

@@ -1335,7 +1335,9 @@ class WCHWXPub(WalletWizardComponent, Logger):
self.ok_l = WWLabel(_('Hardware keystore added to wallet'))
self.ok_l.setAlignment(Qt.AlignCenter)
self.layout().addStretch(1)
self.layout().addWidget(self.ok_l)
self.layout().addStretch(1)
def on_ready(self):
cosigner_data = self.wizard.current_cosigner(self.wizard_data)
@@ -1412,7 +1414,9 @@ class WCHWUninitialized(WalletWizardComponent):
_name, _info = cosigner_data['hardware_device']
label = WWLabel(_('This {} is not initialized. Use manufacturer tooling to initialize the device.').format(_info.model_name))
label.setAlignment(Qt.AlignCenter)
self.layout().addStretch(1)
self.layout().addWidget(label)
self.layout().addStretch(1)
def apply(self):
pass

3
electrum/wizard.py
View File

@@ -322,7 +322,8 @@ class NewWalletWizard(AbstractWizard):
return 'wallet_password'
def on_hardware_device(self, wizard_data: dict, new_wallet=True) -> str:
_type, _info = wizard_data['hardware_device']
current_cosigner = self.current_cosigner(wizard_data)
_type, _info = current_cosigner['hardware_device']
run_hook('init_wallet_wizard', self) # TODO: currently only used for hww, hook name might be confusing
plugin = self.plugins.get_plugin(_type)
return plugin.wizard_entry_for_device(_info, new_wallet=new_wallet)