Skip to content

Commit 029dc0d

Browse files
committed
gui: Add non-mempool balance to wallet overview
1 parent 7af1215 commit 029dc0d

File tree

2 files changed

+38
-4
lines changed

2 files changed

+38
-4
lines changed

src/qt/forms/overviewpage.ui

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,14 @@
130130
</property>
131131
</widget>
132132
</item>
133-
<item row="3" column="0" colspan="2">
133+
<item row="4" column="0" colspan="2">
134134
<widget class="Line" name="line">
135135
<property name="orientation">
136136
<enum>Qt::Horizontal</enum>
137137
</property>
138138
</widget>
139139
</item>
140-
<item row="4" column="0">
140+
<item row="5" column="0">
141141
<widget class="QLabel" name="labelTotalText">
142142
<property name="text">
143143
<string>Total:</string>
@@ -183,7 +183,33 @@
183183
</property>
184184
</widget>
185185
</item>
186-
<item row="4" column="1">
186+
<item row="3" column="1">
187+
<widget class="QLabel" name="labelNonMempool">
188+
<property name="cursor">
189+
<cursorShape>IBeamCursor</cursorShape>
190+
</property>
191+
<property name="toolTip">
192+
<string>Balance for wallet transactions not in the mempool</string>
193+
</property>
194+
<property name="text">
195+
<string notr="true">0.00000000 BTC</string>
196+
</property>
197+
<property name="alignment">
198+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
199+
</property>
200+
<property name="textInteractionFlags">
201+
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
202+
</property>
203+
</widget>
204+
</item>
205+
<item row="3" column="0">
206+
<widget class="QLabel" name="labelNonMempoolText">
207+
<property name="text">
208+
<string>Non-mempool:</string>
209+
</property>
210+
</widget>
211+
</item>
212+
<item row="5" column="1">
187213
<widget class="QLabel" name="labelTotal">
188214
<property name="cursor">
189215
<cursorShape>IBeamCursor</cursorShape>

src/qt/overviewpage.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,20 @@ void OverviewPage::setBalance(const interfaces::WalletBalances& balances)
190190
ui->labelBalance->setText(BitcoinUnits::formatWithPrivacy(unit, balances.balance, BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy));
191191
ui->labelUnconfirmed->setText(BitcoinUnits::formatWithPrivacy(unit, balances.unconfirmed_balance, BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy));
192192
ui->labelImmature->setText(BitcoinUnits::formatWithPrivacy(unit, balances.immature_balance, BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy));
193-
ui->labelTotal->setText(BitcoinUnits::formatWithPrivacy(unit, balances.balance + balances.unconfirmed_balance + balances.immature_balance, BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy));
193+
ui->labelNonMempool->setText(BitcoinUnits::formatWithPrivacy(unit, balances.nonmempool_balance, BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy));
194+
ui->labelTotal->setText(BitcoinUnits::formatWithPrivacy(unit, balances.balance + balances.unconfirmed_balance + balances.immature_balance + balances.nonmempool_balance, BitcoinUnits::SeparatorStyle::ALWAYS, m_privacy));
194195
// only show immature (newly mined) balance if it's non-zero, so as not to complicate things
195196
// for the non-mining users
196197
bool showImmature = balances.immature_balance != 0;
197198

198199
ui->labelImmature->setVisible(showImmature);
199200
ui->labelImmatureText->setVisible(showImmature);
201+
202+
// likewise for non-mempool balances
203+
bool showNonMempool = balances.nonmempool_balance != 0;
204+
205+
ui->labelNonMempool->setVisible(showNonMempool);
206+
ui->labelNonMempoolText->setVisible(showNonMempool);
200207
}
201208

202209
void OverviewPage::setClientModel(ClientModel *model)
@@ -296,5 +303,6 @@ void OverviewPage::setMonospacedFont(const QFont& f)
296303
ui->labelBalance->setFont(f);
297304
ui->labelUnconfirmed->setFont(f);
298305
ui->labelImmature->setFont(f);
306+
ui->labelNonMempool->setFont(f);
299307
ui->labelTotal->setFont(f);
300308
}

0 commit comments

Comments
 (0)