From 2739c2fd7bf255b253a8a5c0a33ff9dc7feebedf Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Wed, 23 Aug 2023 12:03:30 +0200 Subject: [PATCH] wizard: bitbox_ view prefixes to bitbox02_ --- electrum/plugins/bitbox02/bitbox02.py | 14 +++++++------- electrum/plugins/bitbox02/qt.py | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/electrum/plugins/bitbox02/bitbox02.py b/electrum/plugins/bitbox02/bitbox02.py index 53b522785..9d874b997 100644 --- a/electrum/plugins/bitbox02/bitbox02.py +++ b/electrum/plugins/bitbox02/bitbox02.py @@ -727,23 +727,23 @@ class BitBox02Plugin(HW_PluginBase): def wizard_entry_for_device(self, device_info: 'DeviceInfo', *, new_wallet=True) -> str: if new_wallet: - return 'bitbox_start' if device_info.initialized else 'bitbox_not_initialized' + return 'bitbox02_start' if device_info.initialized else 'bitbox02_not_initialized' else: - return 'bitbox_unlock' + return 'bitbox02_unlock' # insert trezor pages in new wallet wizard def extend_wizard(self, wizard: 'NewWalletWizard'): views = { - 'bitbox_start': { - 'next': 'bitbox_xpub', + 'bitbox02_start': { + 'next': 'bitbox02_xpub', }, - 'bitbox_xpub': { + 'bitbox02_xpub': { 'next': lambda d: wizard.wallet_password_view(d) if wizard.last_cosigner(d) else 'multisig_cosigner_keystore', 'accept': wizard.maybe_master_pubkey, 'last': lambda d: wizard.is_single_password() and wizard.last_cosigner(d) }, - 'bitbox_not_initialized': {}, - 'bitbox_unlock': { + 'bitbox02_not_initialized': {}, + 'bitbox02_unlock': { 'last': True }, } diff --git a/electrum/plugins/bitbox02/qt.py b/electrum/plugins/bitbox02/qt.py index b128516cc..084d95062 100644 --- a/electrum/plugins/bitbox02/qt.py +++ b/electrum/plugins/bitbox02/qt.py @@ -77,10 +77,10 @@ class Plugin(BitBox02Plugin, QtPluginBase): def extend_wizard(self, wizard: 'QENewWalletWizard'): super().extend_wizard(wizard) views = { - 'bitbox_start': {'gui': WCScriptAndDerivation}, - 'bitbox_xpub': {'gui': WCHWXPub}, - 'bitbox_not_initialized': {'gui': WCHWUninitialized}, - 'bitbox_unlock': {'gui': WCHWUnlock} + 'bitbox02_start': {'gui': WCScriptAndDerivation}, + 'bitbox02_xpub': {'gui': WCHWXPub}, + 'bitbox02_not_initialized': {'gui': WCHWUninitialized}, + 'bitbox02_unlock': {'gui': WCHWUnlock} } wizard.navmap_merge(views)