Merge #6881: revert: Revert "merge bitcoin-core/gui#835: Fix crash when closing wallet"

826221b revert: Revert "merge bitcoin-core/gui#835: Fix crash when closing wallet" (UdjinM6)

Pull request description:

  ## Issue being fixed or feature implemented
  This reverts commit 20763f1 from #6829.

  The issue that was meant to be fixed by that backport does not exist in our codebase yet, see bitcoin-core/gui#835 (review). Even worse, backporting it too early created an issue where wallets would not be removed from gui while being removed in background.

  ## What was done?
  revert it

  ## How Has This Been Tested?
  open multiple wallets, try closing one of them.

  develop: no visual changes, feels like "Close wallet" menu is not working but wallet is actually removed which can be confirmed by restarting qt
  this PR/previous behaviour: wallet is actually gone from ui asap

  ## Breaking Changes
  n/a

  ## Checklist:

  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  kwvg:
    utACK 826221b

Tree-SHA512: ac50b9f3b7ceb0884a7e51aaf20f66753376569e42327331be8d6635d9b20d56034f6b2655406196e4882b1c4c3dcdbad6311b7b92786a7e51241c6255fdb785

Author: PastaPastaPasta

src/qt/walletcontroller.cpp

@@ -78,14 +78,6 @@ std::map<std::string, bool> WalletController::listWalletDir() const
     return wallets;
 }
 
-void WalletController::removeWallet(WalletModel* wallet_model)
-{
-    // Once the wallet is successfully removed from the node, the model will emit the 'WalletModel::unload' signal.
-    // This signal is already connected and will complete the removal of the view from the GUI.
-    // Look at 'WalletController::getOrCreateWallet' for the signal connection.
-    wallet_model->wallet().remove();
-}
-
 void WalletController::closeWallet(WalletModel* wallet_model, QWidget* parent)
 {
     QMessageBox box(parent);
@@ -96,7 +88,10 @@ void WalletController::closeWallet(WalletModel* wallet_model, QWidget* parent)
     box.setDefaultButton(QMessageBox::Yes);
     if (box.exec() != QMessageBox::Yes) return;
 
-    removeWallet(wallet_model);
+    // First remove wallet from node.
+    wallet_model->wallet().remove();
+    // Now release the model.
+    removeAndDeleteWallet(wallet_model);
 }
 
 void WalletController::closeAllWallets(QWidget* parent)
@@ -109,8 +104,11 @@ void WalletController::closeAllWallets(QWidget* parent)
 
     QMutexLocker locker(&m_mutex);
     for (WalletModel* wallet_model : m_wallets) {
-        removeWallet(wallet_model);
+        wallet_model->wallet().remove();
+        Q_EMIT walletRemoved(wallet_model);
+        delete wallet_model;
     }
+    m_wallets.clear();
 }
 
 WalletModel* WalletController::getOrCreateWallet(std::unique_ptr<interfaces::Wallet> wallet)

src/qt/walletcontroller.h

@@ -79,9 +79,6 @@ class WalletController : public QObject
     std::unique_ptr<interfaces::Handler> m_handler_load_wallet;
 
     friend class WalletControllerActivity;
-
-    //! Starts the wallet closure procedure
-    void removeWallet(WalletModel* wallet_model);
 };
 
 class WalletControllerActivity : public QObject