Merge pull request #376

f012e4d history: show pending on top (Jaquee)

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
             }
         }
 

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();