DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Show incoming memos properly

Browse Source
This commit is contained in:
Aditya Kulkarni
2019-10-27 12:12:00 -07:00
parent 431e907229
commit 3ceb2443a3
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/controller.cpp
View File

@@ -377,10 +377,15 @@ void Controller::refreshTransactions() {
address = (it["address"].is_null() ? "" : QString::fromStdString(it["address"])); address = (it["address"].is_null() ? "" : QString::fromStdString(it["address"]));
model->markAddressUsed(address); model->markAddressUsed(address);
QString memo;
if (!it["memo"].is_null()) {
memo = QString::fromStdString(it["memo"]);
}
items.push_back(TransactionItemDetail{ items.push_back(TransactionItemDetail{
address, address,
CAmount::fromqint64(it["amount"].get<json::number_integer_t>()), CAmount::fromqint64(it["amount"].get<json::number_integer_t>()),
"" memo
}); });
TransactionItem tx{ TransactionItem tx{

4
src/txtablemodel.cpp
View File

@@ -150,14 +150,14 @@ bool TxTableModel::exportToCsv(QString fileName) const {
} }
} }
if (role == Qt::DecorationRole && index.column() == 0) { if (role == Qt::DecorationRole && index.column() == 0) {
bool hasMemo = false; bool hasMemo = false;
for (int i=0; i < dat.items.length(); i++) { for (int i=0; i < dat.items.length(); i++) {
if (!dat.items[i].memo.isEmpty()) { if (!dat.items[i].memo.isEmpty()) {
hasMemo = true; hasMemo = true;
} }
} }
// If the memo is a Payment URI, then show a payment request icon // If the memo is a Payment URI, then show a payment request icon
if (dat.items.length() == 1 && dat.items[0].memo.startsWith("zcash:")) { if (dat.items.length() == 1 && dat.items[0].memo.startsWith("zcash:")) {
QIcon icon(":/icons/res/paymentreq.gif"); QIcon icon(":/icons/res/paymentreq.gif");