From fd7bd64ce870ae0c91177df3a8e76da1b5f08303 Mon Sep 17 00:00:00 2001
From: Sander van Grieken <sander@outrightsolutions.nl>
Date: Wed, 20 Jul 2022 10:42:28 +0200
Subject: [PATCH] qml: delete WizardComponents, move into NewWalletWizard

---
 .../gui/qml/components/NewWalletWizard.qml    | 34 +++++++++++++-
 .../gui/qml/components/WizardComponents.qml   | 44 -------------------
 2 files changed, 33 insertions(+), 45 deletions(-)
 delete mode 100644 electrum/gui/qml/components/WizardComponents.qml

diff --git a/electrum/gui/qml/components/NewWalletWizard.qml b/electrum/gui/qml/components/NewWalletWizard.qml
index 220735608..24578c258 100644
--- a/electrum/gui/qml/components/NewWalletWizard.qml
+++ b/electrum/gui/qml/components/NewWalletWizard.qml
@@ -87,10 +87,42 @@ Wizard {
         page.last = true
     }
 
-    WizardComponents {
+    Item {
         id: components
+        property Component walletname: Component {
+            WCWalletName {}
+        }
+
+        property Component wallettype: Component {
+            WCWalletType {}
+        }
+
+        property Component keystore: Component {
+            WCKeystoreType {}
+        }
+
+        property Component createseed: Component {
+            WCCreateSeed {}
+        }
+
+        property Component haveseed: Component {
+            WCHaveSeed {}
+        }
+
+        property Component confirmseed: Component {
+            WCConfirmSeed {}
+        }
+
+        property Component bip39refine: Component {
+            WCBIP39Refine {}
+        }
+
+        property Component walletpassword: Component {
+            WCWalletPassword {}
+        }
     }
 
+
     Component.onCompleted: {
         _setWizardData({})
         var start = _loadNextComponent(components.walletname)
diff --git a/electrum/gui/qml/components/WizardComponents.qml b/electrum/gui/qml/components/WizardComponents.qml
deleted file mode 100644
index c6f910dad..000000000
--- a/electrum/gui/qml/components/WizardComponents.qml
+++ /dev/null
@@ -1,44 +0,0 @@
-import QtQuick 2.6
-import QtQuick.Layouts 1.0
-import QtQuick.Controls 2.1
-import QtQuick.Controls.Material 2.0
-
-import org.electrum 1.0
-
-import "wizard"
-
-Item {
-    property Component walletname: Component {
-        WCWalletName {}
-    }
-
-    property Component wallettype: Component {
-        WCWalletType {}
-    }
-
-    property Component keystore: Component {
-        WCKeystoreType {}
-    }
-
-    property Component createseed: Component {
-        WCCreateSeed {}
-    }
-
-    property Component haveseed: Component {
-        WCHaveSeed {}
-    }
-
-    property Component confirmseed: Component {
-        WCConfirmSeed {}
-    }
-
-    property Component bip39refine: Component {
-        WCBIP39Refine {}
-    }
-
-    property Component walletpassword: Component {
-        WCWalletPassword {}
-    }
-
-
-}