4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-09 19:32:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes transaction confirmation dialog and also makes sure you will not be able to transfer funds when the daemon is not up (to date)

Browse Source
This commit is contained in:
Sander Ferdinand 2018-03-27 21:12:10 +02:00 committed by moneromooo-monero
parent 9afaa7cf0f
commit 0b7966f625
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main.qml
View File

@ -611,6 +611,7 @@ ApplicationWindow {
// here we show confirmation popup; // here we show confirmation popup;
transactionConfirmationPopup.title = qsTr("Please confirm transaction:\n") + translationManager.emptyString; transactionConfirmationPopup.title = qsTr("Please confirm transaction:\n") + translationManager.emptyString;
transactionConfirmationPopup.text = "";
transactionConfirmationPopup.text += transactionConfirmationPopup.text +=
(address === "" ? "" : (qsTr("\n\nAddress: ") + address)) (address === "" ? "" : (qsTr("\n\nAddress: ") + address))
+ (paymentId === "" ? "" : (qsTr("\nPayment ID: ") + paymentId)) + (paymentId === "" ? "" : (qsTr("\nPayment ID: ") + paymentId))

8
pages/Transfer.qml
View File

@ -332,7 +332,13 @@ Rectangle {
rightIcon: "../images/rightIcon.png" rightIcon: "../images/rightIcon.png"
Layout.topMargin: 4 * scaleRatio Layout.topMargin: 4 * scaleRatio
text: qsTr("Send") + translationManager.emptyString text: qsTr("Send") + translationManager.emptyString
enabled : !appWindow.viewOnly && pageRoot.checkInformation(amountLine.text, addressLine.text, paymentIdLine.text, appWindow.persistentSettings.nettype) enabled : {
// Send button is enabled when:
// 1) Currently opened wallet is not view-only
// 2) There is no warning box displayed
// 3) The transactional information is correct
return !appWindow.viewOnly && warningText.text === '' && pageRoot.checkInformation(amountLine.text, addressLine.text, paymentIdLine.text, appWindow.persistentSettings.nettype);
}
onClicked: { onClicked: {
console.log("Transfer: paymentClicked") console.log("Transfer: paymentClicked")
var priority = priorityModelV5.get(priorityDropdown.currentIndex).priority var priority = priorityModelV5.get(priorityDropdown.currentIndex).priority