History: display blockheight, sort by blockheight

3 files changed, 62 insertions, 28 deletions

diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml
index 867fdedf..0230a662 100644
--- a/components/HistoryTable.qml
+++ b/components/HistoryTable.qml
@@ -119,36 +119,64 @@ ListView {
                 // visible: !descriptionArea.containsMouse
             }
         }
-        // -- "PaymentID" title
-        Text {
-            id: paymentLabel
-            anchors.left: parent.left
-            anchors.top: row1.bottom
-            anchors.topMargin: 4
-            anchors.leftMargin: 28
 
-            width: 118
-            font.family: "Arial"
-            font.pixelSize: 12
-            font.letterSpacing: -1
-            color: "#535353"
-            text: paymentId !== "" ? qsTr("Payment ID:")  + translationManager.emptyString : ""
-        }
-        // -- "PaymentID" value
-        Text {
-            anchors.bottom: paymentLabel.bottom
-            anchors.left: paymentLabel.right
+        Row {
+            // - Payment ID + block height row
+            id: row2
+            anchors.left: parent.left
             anchors.right: parent.right
-            anchors.leftMargin: 12
-            anchors.rightMargin: 12
+            anchors.top: parent.top
+            anchors.topMargin: 40
+            anchors.leftMargin: 26
 
-            elide: Text.ElideRight
-            font.family: "Arial"
-            font.pixelSize: 13
-            font.letterSpacing: -1
-            color: "#545454"
-            text: paymentId
+            // -- "PaymentID" title
+            Text {
+                id: paymentLabel
+                width: 86
+                anchors.bottom: parent.bottom
+                font.family: "Arial"
+                font.pixelSize: 12
+                font.letterSpacing: -1
+                color: "#535353"
+                text: paymentId !== "" ? qsTr("Payment ID:")  + translationManager.emptyString : ""
+            }
+            // -- "PaymentID" value
+            Text {
+                id: paymentIdValue
+                width: 136
+                anchors.bottom: parent.bottom
+                elide: Text.ElideRight
+                font.family: "Arial"
+                font.pixelSize:13
+                font.letterSpacing: -1
+                color: "#545454"
+                text: paymentId
+            }
+            // -- "BlockHeight" title
+            Text {
+                id: blockHeghtTitle
+                anchors.bottom: parent.bottom
+                width: 86
+                font.family: "Arial"
+                font.pixelSize: 12
+                font.letterSpacing: -1
+                color: "#535353"
+                text:  qsTr("BlockHeight:")  + translationManager.emptyString
+            }
+            // -- "BlockHeight" value
+            Text {
+                width: 85
+                anchors.bottom: parent.bottom
+                elide: Text.ElideRight
+                font.family: "Arial"
+                font.pixelSize: 13
+                font.letterSpacing: -1
+                color: "#545454"
+                text: blockHeight
+            }
         }
+
+
         // -- "Date", "Balance" and "Amound" section
         Row {
             anchors.left: parent.left
diff --git a/components/ProcessingSplash.qml b/components/ProcessingSplash.qml
index 84218f88..42312f42 100644
--- a/components/ProcessingSplash.qml
+++ b/components/ProcessingSplash.qml
@@ -44,10 +44,11 @@ Window {
 
     ColumnLayout {
         id: rootLayout
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.verticalCenter: parent.verticalCenter
+
         anchors.left: parent.left
         anchors.right: parent.right
+        anchors.verticalCenter: parent.verticalCenter
+
         anchors.leftMargin: 30
         anchors.rightMargin: 30
 
diff --git a/pages/History.qml b/pages/History.qml
index 4c2a0dec..2ccbf3f9 100644
--- a/pages/History.qml
+++ b/pages/History.qml
@@ -370,6 +370,7 @@ Rectangle {
 
             ListElement { columnName: "Payment ID"; columnWidth: 127 }
             ListElement { columnName: "Date"; columnWidth: 100 }
+            ListElement { columnName: "BlockHeight"; columnWidth: 150 }
             ListElement { columnName: "Amount"; columnWidth: 148 }
             // ListElement { columnName: "Description"; columnWidth: 148 }
         }
@@ -396,6 +397,10 @@ Rectangle {
                     model.sortRole = TransactionHistoryModel.TransactionDateRole
                     break;
                 case 2:
+                    // BlockHeight;
+                    model.sortRole = TransactionHistoryModel.TransactionBlockHeightRole
+                    break;
+                case 3:
                     // Amount;
                     model.sortRole = TransactionHistoryModel.TransactionAmountRole
                     break;