diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:56:51 -0800 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:56:51 -0800 |
| commit | 3badb12ea365bab1b06ed165ebff9889fad0b5b5 (patch) | |
| tree | 117b5147f1441d57da1ef46ab8bd04130b6b5b3d | |
| parent | 24170f00ccf38ca64f766c78c76dc80900cb1533 (diff) | |
| parent | f012e4d9684344651c9031191b1ab4e473b4d216 (diff) | |
| download | monzero-gui-3badb12ea365bab1b06ed165ebff9889fad0b5b5.tar.gz monzero-gui-3badb12ea365bab1b06ed165ebff9889fad0b5b5.tar.xz monzero-gui-3badb12ea365bab1b06ed165ebff9889fad0b5b5.zip | |
Merge pull request #376
f012e4d history: show pending on top (Jaquee)
| -rw-r--r-- | components/HistoryTable.qml | 2 | ||||
| -rw-r--r-- | src/model/TransactionHistoryModel.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml index c11fbd0e..54f029b4 100644 --- a/components/HistoryTable.qml +++ b/components/HistoryTable.qml @@ -265,7 +265,7 @@ ListView { font.pixelSize: 13 font.letterSpacing: -1 color: "#545454" - text: blockHeight + text: (typeof blockHeight != "undefined")? blockHeight : qsTr("Pending") + translationManager.emptyString } } diff --git a/src/model/TransactionHistoryModel.cpp b/src/model/TransactionHistoryModel.cpp index 333893aa..9aed10ce 100644 --- a/src/model/TransactionHistoryModel.cpp +++ b/src/model/TransactionHistoryModel.cpp @@ -75,7 +75,11 @@ QVariant TransactionHistoryModel::data(const QModelIndex &index, int role) const result = tInfo->fee(); break; case TransactionBlockHeightRole: - result = tInfo->blockHeight(); + // 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(); + } break; case TransactionHashRole: result = tInfo->hash(); |