aboutsummaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorJaquee <jaquee.monero@gmail.com>2017-01-12 19:57:30 +0100
committerJaquee <jaquee.monero@gmail.com>2017-01-14 00:45:09 +0100
commit205bfcdd7bf051440cda231fc49e7f58d8c1a7ee (patch)
treef3fedbc7964bb9585b5ab901eb6388e00821549b /components
parent593839a374f6fb69df84d1cda5261ed246e9028f (diff)
downloadmonzero-gui-205bfcdd7bf051440cda231fc49e7f58d8c1a7ee.tar.gz
monzero-gui-205bfcdd7bf051440cda231fc49e7f58d8c1a7ee.tar.xz
monzero-gui-205bfcdd7bf051440cda231fc49e7f58d8c1a7ee.zip
History: Show num of confirmations + unconfirmed payments
history: refresh on new block
Diffstat (limited to 'components')
-rw-r--r--components/HistoryTable.qml15
1 files changed, 12 insertions, 3 deletions
diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml
index ba956015..711bc289 100644
--- a/components/HistoryTable.qml
+++ b/components/HistoryTable.qml
@@ -263,9 +263,18 @@ ListView {
//elide: Text.ElideRight
font.family: "Arial"
font.pixelSize: 13
- font.letterSpacing: -1
- color: "#545454"
- text: (typeof blockHeight != "undefined")? blockHeight : qsTr("Pending") + translationManager.emptyString
+ color: (confirmations < 10)? "#FF6C3C" : "#545454"
+ text: {
+ if (!isPending)
+ if(confirmations < 10)
+ return blockHeight + " " + qsTr("(%1/10 confirmations)").arg(confirmations)
+ else
+ return blockHeight
+ if (!isOut)
+ return qsTr("UNCONFIRMED") + translationManager.emptyString
+ return qsTr("PENDING") + translationManager.emptyString
+
+ }
}
}