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

change some gui elements, deactivate contact request for now

Browse Source
This commit is contained in:
DenioD
2020-04-30 22:58:35 +02:00
parent 623e5b6d2c
commit 7194122449
5 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/controller.cpp
View File

@@ -879,37 +879,40 @@ void Controller::refreshTransactions() {
QString memo;
if (!o["memo"].is_null()) {
memo = QString::fromStdString(o["memo"]);
}
ChatItem item = ChatItem(
ChatItem item = ChatItem(
datetime,
address,
QString(""),
memo,
true // is an outgoing message
memo
// true // is an outgoing message
);
chatModel->addMessage(item);
}
items.push_back(TransactionItemDetail{address, amount, memo});
total_amount = total_amount + amount;
}
// }
{
// {
// Concat all the addresses
QList<QString> addresses;
for (auto item : items) {
// QList<QString> addresses;
// for (auto item : items) {
addresses.push_back(item.address);
// addresses.push_back(item.address);
address = addresses.join(",");
}
// }
}
// }
txdata.push_back(TransactionItem{
"send", datetime, address, txid,confirmations, items
});
}
} else {
// Incoming Transaction
address = (it["address"].is_null() ? "" : QString::fromStdString(it["address"]));
@@ -919,8 +922,14 @@ void Controller::refreshTransactions() {
if (!it["memo"].is_null()) {
memo = QString::fromStdString(it["memo"]);
}
TransactionItem tx{
"Receive", datetime, address, txid,confirmations, items
};
ChatItem item = ChatItem(
txdata.push_back(tx);
ChatItem item = ChatItem(
datetime,
address,
QString(""),
@@ -933,13 +942,6 @@ void Controller::refreshTransactions() {
CAmount::fromqint64(it["amount"].get<json::number_integer_t>()),
memo
});
TransactionItem tx{
"Receive", datetime, address, txid,confirmations, items
};
txdata.push_back(tx);
}
}