From 4a12b285e4b15d6b3888fd4124d8dce3482f886d Mon Sep 17 00:00:00 2001
From: Sander van Grieken <sander@outrightsolutions.nl>
Date: Thu, 27 Jul 2023 23:22:45 +0200
Subject: [PATCH] qt: submit final state to wizard and return proper dialog
 result when finished

---
 electrum/gui/qt/wizard/wallet.py | 47 +++++++++++++++++---------------
 electrum/gui/qt/wizard/wizard.py |  3 +-
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/electrum/gui/qt/wizard/wallet.py b/electrum/gui/qt/wizard/wallet.py
index 278f09c1a..a6a211acc 100644
--- a/electrum/gui/qt/wizard/wallet.py
+++ b/electrum/gui/qt/wizard/wallet.py
@@ -98,28 +98,31 @@ class QENewWalletWizard(NewWalletWizard, QEAbstractWizard):
     # def isMatchingSeed(self, seed, seed_again):
     #     return mnemonic.is_matching_seed(seed=seed, seed_again=seed_again)
     #
-    # @pyqtSlot('QJSValue', bool, str)
-    # def createStorage(self, js_data, single_password_enabled, single_password):
-    #     self._logger.info('Creating wallet from wizard data')
-    #     data = js_data.toVariant()
-    #
-    #     if single_password_enabled and single_password:
-    #         data['encrypt'] = True
-    #         data['password'] = single_password
-    #
-    #     path = os.path.join(os.path.dirname(self._daemon.daemon.config.get_wallet_path()), data['wallet_name'])
-    #
-    #     try:
-    #         self.create_storage(path, data)
-    #
-    #         # minimally populate self after create
-    #         self._password = data['password']
-    #         self.path = path
-    #
-    #         self.createSuccess.emit()
-    #     except Exception as e:
-    #         self._logger.error(f"createStorage errored: {e!r}")
-    #         self.createError.emit(str(e))
+
+    def create_storage(self, single_password: str = None):
+        self._logger.info('Creating wallet from wizard data')
+        # data = js_data.toVariant()
+        data = self._current.wizard_data
+
+        if self.is_single_password() and single_password:
+            data['encrypt'] = True
+            data['password'] = single_password
+
+        path = os.path.join(os.path.dirname(self._daemon.config.get_wallet_path()), data['wallet_name'])
+
+        try:
+            super().create_storage(path, data)
+
+            # minimally populate self after create
+            self._password = data['password']
+            # self.path = path
+
+            # self.createSuccess.emit()
+            return True
+        except Exception as e:
+            self._logger.error(f"createStorage errored: {e!r}")
+            return False
+            # self.createError.emit(str(e))
 
 
 class WCWalletName(WizardComponent):
diff --git a/electrum/gui/qt/wizard/wizard.py b/electrum/gui/qt/wizard/wizard.py
index 80d5db53e..c8f3663c8 100644
--- a/electrum/gui/qt/wizard/wizard.py
+++ b/electrum/gui/qt/wizard/wizard.py
@@ -143,8 +143,9 @@ class QEAbstractWizard(QDialog):
         page.apply()
         wd = page.wizard_data.copy()
         if self.is_last(wd):
+            self.submit(wd)
             self.finished(wd)
-            self.close()
+            self.accept()
         else:
             next = self.submit(wd)
             self.load_next_component(next['view'], wd)