From c485753ffd60c14364b3763d6549869ec927d235 Mon Sep 17 00:00:00 2001
From: Sander van Grieken <sander@outrightsolutions.nl>
Date: Mon, 31 Jul 2023 21:47:51 +0200
Subject: [PATCH] wizard: rename bip39_refine to script_and_derivation

---
 electrum/gui/qml/qewizard.py     |  4 ++--
 electrum/gui/qt/wizard/wallet.py |  6 +++---
 electrum/wizard.py               | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/electrum/gui/qml/qewizard.py b/electrum/gui/qml/qewizard.py
index 9bc68173b..57a08cfce 100644
--- a/electrum/gui/qml/qewizard.py
+++ b/electrum/gui/qml/qewizard.py
@@ -58,13 +58,13 @@ class QENewWalletWizard(NewWalletWizard, QEAbstractWizard):
             'create_seed': { 'gui': 'WCCreateSeed' },
             'confirm_seed': { 'gui': 'WCConfirmSeed' },
             'have_seed': { 'gui': 'WCHaveSeed' },
-            'bip39_refine': { 'gui': 'WCBIP39Refine' },
+            'script_and_derivation': { 'gui': 'WCBIP39Refine' },
             'have_master_key': { 'gui': 'WCHaveMasterKey' },
             'multisig': { 'gui': 'WCMultisig' },
             'multisig_cosigner_keystore': { 'gui': 'WCCosignerKeystore' },
             'multisig_cosigner_key': { 'gui': 'WCHaveMasterKey' },
             'multisig_cosigner_seed': { 'gui': 'WCHaveSeed' },
-            'multisig_cosigner_bip39_refine': { 'gui': 'WCBIP39Refine' },
+            'multisig_cosigner_script_and_derivation': { 'gui': 'WCBIP39Refine' },
             'imported': { 'gui': 'WCImport' },
             'wallet_password': { 'gui': 'WCWalletPassword' }
         })
diff --git a/electrum/gui/qt/wizard/wallet.py b/electrum/gui/qt/wizard/wallet.py
index 93deb0c20..3d71b5d89 100644
--- a/electrum/gui/qt/wizard/wallet.py
+++ b/electrum/gui/qt/wizard/wallet.py
@@ -48,13 +48,13 @@ class QENewWalletWizard(NewWalletWizard, QEAbstractWizard):
             'confirm_ext': { 'gui': WCConfirmExt },
             'have_seed': { 'gui': WCHaveSeed },
             'have_ext': { 'gui': WCEnterExt },
-            'bip39_refine': { 'gui': WCBIP39Refine },
+            'script_and_derivation': { 'gui': WCScriptAndDerivation},
             'have_master_key': { 'gui': WCHaveMasterKey },
             'multisig': { 'gui': WCMultisig },
             'multisig_cosigner_keystore': { 'gui': WCCosignerKeystore },
             'multisig_cosigner_key': { 'gui': WCHaveMasterKey },
             'multisig_cosigner_seed': { 'gui': WCHaveSeed },
-            'multisig_cosigner_bip39_refine': { 'gui': WCBIP39Refine },
+            'multisig_cosigner_script_and_derivation': { 'gui': WCScriptAndDerivation},
             'imported': { 'gui': WCImport },
             'wallet_password': { 'gui': WCWalletPassword }
         })
@@ -461,7 +461,7 @@ class WCHaveSeed(WizardComponent):
         wizard_data['seed_extra_words'] = ''  # empty default
 
 
-class WCBIP39Refine(WizardComponent):
+class WCScriptAndDerivation(WizardComponent):
     _logger = get_logger(__name__)
 
     def __init__(self, parent, wizard):
diff --git a/electrum/wizard.py b/electrum/wizard.py
index 6df066e36..2d86cd4d7 100644
--- a/electrum/wizard.py
+++ b/electrum/wizard.py
@@ -201,7 +201,7 @@ class NewWalletWizard(AbstractWizard):
                 'accept': self.maybe_master_pubkey,
                 'last': lambda d: self.is_single_password() and not self.is_bip39_seed(d) and not self.is_multisig(d)
             },
-            'bip39_refine': {
+            'script_and_derivation': {
                 'next': lambda d: 'wallet_password' if not self.is_multisig(d) else 'multisig_cosigner_keystore',
                 'accept': self.maybe_master_pubkey,
                 'last': lambda d: self.is_single_password() and not self.is_multisig(d)
@@ -225,7 +225,7 @@ class NewWalletWizard(AbstractWizard):
                 'next': self.on_have_cosigner_seed,
                 'last': lambda d: self.is_single_password() and self.has_all_cosigner_data(d)
             },
-            'multisig_cosigner_bip39_refine': {
+            'multisig_cosigner_script_and_derivation': {
                 'next': lambda d: 'wallet_password' if self.has_all_cosigner_data(d) else 'multisig_cosigner_keystore',
                 'last': lambda d: self.is_single_password() and self.has_all_cosigner_data(d)
             },
@@ -277,9 +277,9 @@ class NewWalletWizard(AbstractWizard):
 
     def on_have_or_confirm_seed(self, wizard_data):
         if self.is_bip39_seed(wizard_data):
-            return 'bip39_refine'
+            return 'script_and_derivation'
         elif self.is_slip39_seed(wizard_data):
-            return 'bip39_refine'
+            return 'script_and_derivation'
         elif self.is_multisig(wizard_data):
             return 'multisig_cosigner_keystore'
         else:
@@ -305,7 +305,7 @@ class NewWalletWizard(AbstractWizard):
         if self.has_all_cosigner_data(wizard_data):
             return 'wallet_password'
         elif current_cosigner_data['seed_type'] == 'bip39' and 'derivation_path' not in current_cosigner_data:
-            return 'multisig_cosigner_bip39_refine'
+            return 'multisig_cosigner_script_and_derivation'
         else:
             return 'multisig_cosigner_keystore'