4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-14 04:16:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #376

Browse Source 
f012e4d history: show pending on top (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-01-08 16:56:51 -08:00
commit 3badb12ea3
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/HistoryTable.qml
View File

@ -265,7 +265,7 @@ ListView {
font.pixelSize: 13 font.pixelSize: 13
font.letterSpacing: -1 font.letterSpacing: -1
color: "#545454" color: "#545454"
text: blockHeight text: (typeof blockHeight != "undefined")? blockHeight : qsTr("Pending") + translationManager.emptyString
} }
} }

4
src/model/TransactionHistoryModel.cpp
View File

@ -75,7 +75,11 @@ QVariant TransactionHistoryModel::data(const QModelIndex &index, int role) const
result = tInfo->fee(); result = tInfo->fee();
break; break;
case TransactionBlockHeightRole: case TransactionBlockHeightRole:
// Use NULL QVariant for transactions without height.
// Forces them to be displayed at top when sorted by blockHeight.
if (tInfo->blockHeight() != 0) {
result = tInfo->blockHeight(); result = tInfo->blockHeight();
}
break; break;
case TransactionHashRole: case TransactionHashRole:
result = tInfo->hash(); result = tInfo->hash();