monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 00:07:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #94

Browse source 
2a71bd6 Change default mixin to 4 & add mixin # to confirmation window (dEBRUYNE-1)
This commit is contained in:
Riccardo Spagni 2016-11-05 10:08:24 +02:00
commit 56043ec483
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
main.qml
View file

@ -390,11 +390,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()

2
pages/Transfer.qml
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 {