Add pending ops

This commit is contained in:
adityapk00
2019-01-22 23:10:01 -08:00
parent ea8375ce20
commit 10fe5f3cd4
2 changed files with 17 additions and 0 deletions

View File

@@ -46,6 +46,7 @@ public:
void sendZTransaction (json params, const std::function<void(json)>& cb);
void watchTxStatus();
void addNewTxToWatch(Tx tx, const QString& newOpid);
const QMap<QString, Tx> getWatchingTxns() { return watchingOps; }
const TxTableModel* getTransactionsModel() { return transactionsTableModel; }
const QList<QString>* getAllZAddresses() { return zaddresses; }

View File

@@ -185,6 +185,22 @@ QJsonDocument AppDataServer::processGetInfo(MainWindow* mainWindow) {
QJsonDocument AppDataServer::processGetTransactions(MainWindow* mainWindow) {
QJsonArray txns;
auto model = mainWindow->getRPC()->getTransactionsModel();
// Manually add pending ops, so that computing transactions will also show up
auto wtxns = mainWindow->getRPC()->getWatchingTxns();
for (auto opid : wtxns.keys()) {
txns.append(QJsonObject{
{"type", "send"},
{"datetime", QDateTime::currentSecsSinceEpoch()},
{"amount", wtxns[opid].toAddrs[0].amount},
{"txid", ""},
{"address", wtxns[opid].toAddrs[0].addr},
{"memo", wtxns[opid].toAddrs[0].txtMemo},
{"confirmations", 0}
});
}
// Add transactions
for (int i = 0; i < model->rowCount(QModelIndex()) && i < Settings::getMaxMobileAppTxns(); i++) {
txns.append(QJsonObject{
{"type", model->getType(i)},