From f73e5c972ab096e0f80cb9e753fa221d17313358 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Sat, 15 May 2021 22:58:08 +0300
Subject: [PATCH] qt: Move CreateWalletActivity connection from WalletFrame to
 BitcoinGUI

This changes remove some pointers to the BitcoinGUI instance that is
required for the next commits.

This commit does not change behavior.
---
 src/qt/bitcoingui.cpp  | 5 +++++
 src/qt/walletframe.cpp | 8 +-------
 src/qt/walletframe.h   | 2 ++
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 4fb693cc6ee..eaacacb0535 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -104,6 +104,11 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
     {
         /** Create wallet frame and make it the central widget */
         walletFrame = new WalletFrame(_platformStyle, this);
+        connect(walletFrame, &WalletFrame::createWalletButtonClicked, [this] {
+            auto activity = new CreateWalletActivity(getWalletController(), this);
+            connect(activity, &CreateWalletActivity::finished, activity, &QObject::deleteLater);
+            activity->create();
+        });
         setCentralWidget(walletFrame);
     } else
 #endif // ENABLE_WALLET
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
index af8eb4006ac..f85a882eed0 100644
--- a/src/qt/walletframe.cpp
+++ b/src/qt/walletframe.cpp
@@ -5,9 +5,7 @@
 #include <qt/walletframe.h>
 
 #include <qt/bitcoingui.h>
-#include <qt/createwalletdialog.h>
 #include <qt/overviewpage.h>
-#include <qt/walletcontroller.h>
 #include <qt/walletmodel.h>
 #include <qt/walletview.h>
 
@@ -42,11 +40,7 @@ WalletFrame::WalletFrame(const PlatformStyle* _platformStyle, BitcoinGUI* _gui)
 
     // A button for create wallet dialog
     QPushButton* create_wallet_button = new QPushButton(tr("Create a new wallet"), walletStack);
-    connect(create_wallet_button, &QPushButton::clicked, [this] {
-        auto activity = new CreateWalletActivity(gui->getWalletController(), this);
-        connect(activity, &CreateWalletActivity::finished, activity, &QObject::deleteLater);
-        activity->create();
-    });
+    connect(create_wallet_button, &QPushButton::clicked, this, &WalletFrame::createWalletButtonClicked);
     no_wallet_layout->addWidget(create_wallet_button, 0, Qt::AlignHCenter | Qt::AlignTop);
     no_wallet_group->setLayout(no_wallet_layout);
 
diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h
index fcea4b3d22c..74bdef40df3 100644
--- a/src/qt/walletframe.h
+++ b/src/qt/walletframe.h
@@ -51,6 +51,8 @@ Q_SIGNALS:
     /** Notify that the user has requested more information about the out-of-sync warning */
     void requestedSyncWarningInfo();
 
+    void createWalletButtonClicked();
+
 private:
     QStackedWidget *walletStack;
     BitcoinGUI *gui;