Change default mixin to 4 & add mixin # to confirmation window

This commit is contained in:
dEBRUYNE-1 2016-10-31 19:28:48 +01:00
parent 6c6b10855f
commit 2a71bd6c11
No known key found for this signature in database
GPG key ID: B9145F6EBFA81C32
2 changed files with 4 additions and 3 deletions

View file

@ -372,11 +372,12 @@ ApplicationWindow {
// here we show confirmation popup; // here we show confirmation popup;
transactionConfirmationPopup.title = qsTr("Confirmation") + translationManager.emptyString transactionConfirmationPopup.title = qsTr("Confirmation") + translationManager.emptyString
transactionConfirmationPopup.text = qsTr("Please confirm transaction:\n\n") transactionConfirmationPopup.text = qsTr("Please confirm transaction:\n")
+ qsTr("\nAddress: ") + address + qsTr("\nAddress: ") + address
+ qsTr("\nPayment ID: ") + paymentId + qsTr("\nPayment ID: ") + paymentId
+ qsTr("\nAmount: ") + walletManager.displayAmount(transaction.amount) + qsTr("\n\nAmount: ") + walletManager.displayAmount(transaction.amount)
+ qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee) + qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee)
+ qsTr("\n\nMixin: ") + mixinCount
+ translationManager.emptyString + translationManager.emptyString
transactionConfirmationPopup.icon = StandardIcon.Question transactionConfirmationPopup.icon = StandardIcon.Question
transactionConfirmationPopup.open() transactionConfirmationPopup.open()

View file

@ -39,7 +39,7 @@ Rectangle {
color: "#F0EEEE" color: "#F0EEEE"
function scaleValueToMixinCount(scaleValue) { function scaleValueToMixinCount(scaleValue) {
var scaleToMixinCount = [2,3,4,5,5,5,6,7,8,9,10,15,20,25]; var scaleToMixinCount = [4,5,6,7,8,9,10,11,12,13,14,15,20,25];
if (scaleValue < scaleToMixinCount.length) { if (scaleValue < scaleToMixinCount.length) {
return scaleToMixinCount[scaleValue]; return scaleToMixinCount[scaleValue];
} else { } else {