diff options
| author | xiphon <xiphon@protonmail.com> | 2020-10-15 10:22:29 +0000 |
|---|---|---|
| committer | xiphon <xiphon@protonmail.com> | 2020-10-15 10:23:06 +0000 |
| commit | 79ee8934993ff0b4506fbb63fa091e49ff1786ff (patch) | |
| tree | fd395f9a11ff1e43d616a5677b7fd6ef283aeda9 | |
| parent | cb1f3ad0ce228b9c272df76838754e303b074a32 (diff) | |
| download | monzero-gui-79ee8934993ff0b4506fbb63fa091e49ff1786ff.tar.gz monzero-gui-79ee8934993ff0b4506fbb63fa091e49ff1786ff.tar.xz monzero-gui-79ee8934993ff0b4506fbb63fa091e49ff1786ff.zip | |
History: fix failed and pending tx statuses
| -rw-r--r-- | pages/History.qml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pages/History.qml b/pages/History.qml index 4e5ccd1f..446ef670 100644 --- a/pages/History.qml +++ b/pages/History.qml @@ -764,12 +764,18 @@ Rectangle { font.pixelSize: 15 text: { if (isout) { + if (isFailed) { + return qsTr("Failed") + translationManager.emptyString; + } + if (isPending) { + return qsTr("Waiting confirmation...") + translationManager.emptyString; + } if (address) { const addressBookName = currentWallet ? currentWallet.addressBook.getDescription(address) : null; return (addressBookName ? FontAwesome.addressBook + " " + addressBookName : TxUtils.addressTruncate(address, 8)); } if (amount != 0) { - return (blockheight ? qsTr("Unknown recipient") : qsTr("Waiting confirmation...")) + translationManager.emptyString; + return qsTr("Unknown recipient") + translationManager.emptyString; } else { return qsTr("My wallet") + translationManager.emptyString; } @@ -1489,6 +1495,8 @@ Rectangle { for (var i = 0; i < count; ++i) { var idx = _model.index(i, 0); + var isPending = model.data(idx, TransactionHistoryModel.TransactionPendingRole); + var isFailed = model.data(idx, TransactionHistoryModel.TransactionFailedRole); var isout = _model.data(idx, TransactionHistoryModel.TransactionIsOutRole); var amount = _model.data(idx, TransactionHistoryModel.TransactionAmountRole); var hash = _model.data(idx, TransactionHistoryModel.TransactionHashRole); @@ -1525,6 +1533,8 @@ Rectangle { root.txModelData.push({ "i": i, + "isPending": isPending, + "isFailed": isFailed, "isout": isout, "amount": amount, "displayAmount": displayAmount, |