diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui
index f85de0811aa1..e0f65af0989e 100644
--- a/src/qt/forms/overviewpage.ui
+++ b/src/qt/forms/overviewpage.ui
@@ -14,25 +14,6 @@
Form
- -
-
-
- false
-
-
- QLabel { background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #F0D0A0, stop:1 #F8D488); color:#000000; }
-
-
- true
-
-
- 3
-
-
- Qt::TextSelectableByMouse
-
-
-
-
-
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index b3bbb9b4d388..f94f06b61d98 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -251,10 +251,6 @@ void OverviewPage::setClientModel(ClientModel *model)
{
this->clientModel = model;
if (model) {
- // Show warning, for example if this is a prerelease version
- connect(model, &ClientModel::alertsChanged, this, &OverviewPage::updateAlerts);
- updateAlerts(model->getStatusBarWarnings());
-
connect(model->getOptionsModel(), &OptionsModel::fontForMoneyChanged, this, &OverviewPage::setMonospacedFont);
setMonospacedFont(QFont() /* ignored */);
}
@@ -333,12 +329,6 @@ void OverviewPage::updateDisplayUnit()
}
}
-void OverviewPage::updateAlerts(const QString &warnings)
-{
- this->ui->labelAlerts->setVisible(!warnings.isEmpty());
- this->ui->labelAlerts->setText(warnings);
-}
-
void OverviewPage::showOutOfSyncWarning(bool fShow)
{
ui->labelWalletStatus->setVisible(fShow);
diff --git a/src/qt/overviewpage.h b/src/qt/overviewpage.h
index fc7a99f319aa..8bf9c6e8df89 100644
--- a/src/qt/overviewpage.h
+++ b/src/qt/overviewpage.h
@@ -63,7 +63,6 @@ private Q_SLOTS:
void LimitTransactionRows();
void updateDisplayUnit();
void handleTransactionClicked(const QModelIndex &index);
- void updateAlerts(const QString &warnings);
void updateWatchOnlyLabels(bool showWatchOnly);
void setMonospacedFont(const QFont&);
};
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
index 6e25dec98f6d..9cb8bdbb9cbc 100644
--- a/src/qt/walletframe.cpp
+++ b/src/qt/walletframe.cpp
@@ -22,7 +22,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -33,18 +32,13 @@ WalletFrame::WalletFrame(const PlatformStyle* _platformStyle, QWidget* parent)
platformStyle(_platformStyle),
m_size_hint(OverviewPage{platformStyle, nullptr}.sizeHint())
{
- // Leave HBox hook for adding a list view later
- QHBoxLayout *walletFrameLayout = new QHBoxLayout(this);
+ QVBoxLayout *walletFrameLayout = new QVBoxLayout(this);
setContentsMargins(0,0,0,0);
walletStack = new QStackedWidget(this);
m_global_stack = new QStackedWidget(this);
m_global_stack->addWidget(walletStack);
walletFrameLayout->setContentsMargins(0,0,0,0);
- walletFrameLayout->addWidget(m_global_stack);
-
- // hbox for no wallet
- QWidget* no_wallet_group = new QWidget(walletStack);
- QVBoxLayout* no_wallet_layout = new QVBoxLayout(no_wallet_group);
+ walletFrameLayout->setSpacing(0);
m_label_alerts = new QLabel(this);
m_label_alerts->setVisible(false);
@@ -52,7 +46,12 @@ WalletFrame::WalletFrame(const PlatformStyle* _platformStyle, QWidget* parent)
m_label_alerts->setWordWrap(true);
m_label_alerts->setMargin(3);
m_label_alerts->setTextInteractionFlags(Qt::TextSelectableByMouse);
- no_wallet_layout->addWidget(m_label_alerts, 0, Qt::AlignTop);
+ walletFrameLayout->addWidget(m_label_alerts);
+ walletFrameLayout->addWidget(m_global_stack);
+
+ // hbox for no wallet
+ QWidget* no_wallet_group = new QWidget(walletStack);
+ QVBoxLayout* no_wallet_layout = new QVBoxLayout(no_wallet_group);
QLabel *noWallet = new QLabel(tr("No wallet has been loaded.\nGo to File > Open Wallet to load a wallet.\n- OR -"));
noWallet->setAlignment(Qt::AlignCenter);