Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

Merge pull request #1894

Browse Source 
3840126 merchant: hide color stripe (selsta)
2d18821 merchant: round in ago() function (selsta)
aa82615 merchant: fix payment tracker sorting (selsta)
84c509c merchant: fix timezone offset (selsta)
This commit is contained in:
luigi1111
2019-01-21 14:56:27 -06:00
parent b44bcffd6f 84c509c00d
commit 2b3be5ef9a
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/merchant/Merchant.qml
View File

@@ -603,7 +603,7 @@ Item {
var isout = model.data(idx, TransactionHistoryModel.TransactionIsOutRole);
var timeDate = model.data(idx, TransactionHistoryModel.TransactionDateRole);
var timeHour = model.data(idx, TransactionHistoryModel.TransactionTimeRole);
var timeEpoch = new Date(timeDate + "T" + timeHour + "Z") .getTime() / 1000;
var timeEpoch = new Date(timeDate + "T" + timeHour) .getTime() / 1000;
var subaddrAccount = model.data(idx, TransactionHistoryModel.TransactionSubaddrAccountRole);
var subaddrIndex = model.data(idx, TransactionHistoryModel.TransactionSubaddrIndexRole);