sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix incomingTransaction notifications

Browse Source 
Signed-off-by: pasta <pasta@dashboost.org>
This commit is contained in:
pasta 2020-07-12 00:45:00 -05:00
parent 2af7ce84fb
commit a670374937
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qt/bitcoingui.cpp
View File

@ -1339,7 +1339,7 @@ void BitcoinGUI::showEvent(QShowEvent *event)
void BitcoinGUI::incomingTransaction(const QString& date, int unit, const CAmount& amount, const QString& type, const QString& address, const QString& label, const QString& walletName) void BitcoinGUI::incomingTransaction(const QString& date, int unit, const CAmount& amount, const QString& type, const QString& address, const QString& label, const QString& walletName)
{ {
IncomingTransactionMessage itx = { IncomingTransactionMessage itx = {
date, unit, amount, type, address, label date, unit, amount, type, address, label, walletName
}; };
incomingTransactions.emplace_back(itx); incomingTransactions.emplace_back(itx);
@ -1406,8 +1406,8 @@ void BitcoinGUI::showIncomingTransactions()
// On new transaction, make an info balloon // On new transaction, make an info balloon
QString msg = tr("Date: %1\n").arg(itx.date) + QString msg = tr("Date: %1\n").arg(itx.date) +
tr("Amount: %1\n").arg(BitcoinUnits::formatWithUnit(itx.unit, itx.amount, true)); tr("Amount: %1\n").arg(BitcoinUnits::formatWithUnit(itx.unit, itx.amount, true));
if (WalletModel::isMultiwallet() && !walletName.isEmpty()) { if (WalletModel::isMultiwallet() && !itx.walletName.isEmpty()) {
msg += tr("Wallet: %1\n").arg(walletName); msg += tr("Wallet: %1\n").arg(itx.walletName);
} }
msg += tr("Type: %1\n").arg(itx.type); msg += tr("Type: %1\n").arg(itx.type);
if (!itx.label.isEmpty()) if (!itx.label.isEmpty())

1
src/qt/bitcoingui.h
View File

@ -159,6 +159,7 @@ private:
QString type; QString type;
QString address; QString address;
QString label; QString label;
QString walletName;
}; };
std::list<IncomingTransactionMessage> incomingTransactions; std::list<IncomingTransactionMessage> incomingTransactions;
QTimer* incomingTransactionsTimer; QTimer* incomingTransactionsTimer;