diff options
| author | dEBRUYNE-1 <dEBRUYNE-1@users.noreply.github.com> | 2016-10-31 19:28:48 +0100 |
|---|---|---|
| committer | dEBRUYNE-1 <dEBRUYNE-1@users.noreply.github.com> | 2016-10-31 19:28:48 +0100 |
| commit | 2a71bd6c115feab24933a627c5cbd1b8d7ff6c0e (patch) | |
| tree | fe16307b24d69889bd0b796d830e2f31ed35597a | |
| parent | 6c6b10855f23195cb2b6bd2acd45995947592997 (diff) | |
| download | monzero-gui-2a71bd6c115feab24933a627c5cbd1b8d7ff6c0e.tar.gz monzero-gui-2a71bd6c115feab24933a627c5cbd1b8d7ff6c0e.tar.xz monzero-gui-2a71bd6c115feab24933a627c5cbd1b8d7ff6c0e.zip | |
Change default mixin to 4 & add mixin # to confirmation window
| -rw-r--r-- | main.qml | 5 | ||||
| -rw-r--r-- | pages/Transfer.qml | 2 |
2 files changed, 4 insertions, 3 deletions
@@ -372,11 +372,12 @@ ApplicationWindow { // here we show confirmation popup; 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("\nPayment ID: ") + paymentId - + qsTr("\nAmount: ") + walletManager.displayAmount(transaction.amount) + + qsTr("\n\nAmount: ") + walletManager.displayAmount(transaction.amount) + qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee) + + qsTr("\n\nMixin: ") + mixinCount + translationManager.emptyString transactionConfirmationPopup.icon = StandardIcon.Question transactionConfirmationPopup.open() diff --git a/pages/Transfer.qml b/pages/Transfer.qml index ef46d39e..2ea3fb9a 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -39,7 +39,7 @@ Rectangle { color: "#F0EEEE" 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) { return scaleToMixinCount[scaleValue]; } else { |