zecfoundation
/
zecwallet-lite
mirror of https://github.com/ZcashFoundation/zecwallet-lite.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #17 from dreadlokeur/master 

Support lower version of Qt
This commit is contained in:
adityapk00 2018-10-28 11:13:53 -07:00 committed by GitHub
parent 32fde229c4 833eb47f4a
commit 507edfa8de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/senttxstore.cpp
View File

@ -87,7 +87,7 @@ void SentTxStore::addToSentTx(Tx tx, QString txid) {
QJsonObject txItem;
txItem["type"] = "sent";
txItem["from"] = tx.fromAddr;
txItem["datetime"] = QDateTime().currentSecsSinceEpoch();
txItem["datetime"] = QDateTime().currentMSecsSinceEpoch();
txItem["address"] = QString(); // The sent address is blank, to be consistent with t-Addr sent behaviour
txItem["txid"] = txid;
txItem["amount"] = -totalAmount;

4
src/txtablemodel.cpp
View File

@ -98,7 +98,7 @@ void TxTableModel::updateAllData() {
else
return addr;
}
case 2: return QDateTime::fromSecsSinceEpoch(modeldata->at(index.row()).datetime).toLocalTime().toString();
case 2: return QDateTime::fromMSecsSinceEpoch(modeldata->at(index.row()).datetime).toLocalTime().toString();
case 3: return Settings::getInstance()->getZECDisplayFormat(modeldata->at(index.row()).amount);
}
}
@ -114,7 +114,7 @@ void TxTableModel::updateAllData() {
else
return addr;
}
case 2: return QDateTime::fromSecsSinceEpoch(modeldata->at(index.row()).datetime).toLocalTime().toString();
case 2: return QDateTime::fromMSecsSinceEpoch(modeldata->at(index.row()).datetime).toLocalTime().toString();
case 3: return Settings::getInstance()->getUSDFormat(modeldata->at(index.row()).amount);
}
}