diff --git a/main.qml b/main.qml index 5b1cabfb..ba9064c2 100644 --- a/main.qml +++ b/main.qml @@ -611,6 +611,7 @@ ApplicationWindow { // here we show confirmation popup; transactionConfirmationPopup.title = qsTr("Please confirm transaction:\n") + translationManager.emptyString; + transactionConfirmationPopup.text = ""; transactionConfirmationPopup.text += (address === "" ? "" : (qsTr("\n\nAddress: ") + address)) + (paymentId === "" ? "" : (qsTr("\nPayment ID: ") + paymentId)) diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 8f212dd9..db46f04d 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -332,7 +332,13 @@ Rectangle { rightIcon: "../images/rightIcon.png" Layout.topMargin: 4 * scaleRatio 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: { console.log("Transfer: paymentClicked") var priority = priorityModelV5.get(priorityDropdown.currentIndex).priority