aboutsummaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-02-01 01:07:47 -0600
committerluigi1111 <luigi1111w@gmail.com>2019-02-01 01:07:47 -0600
commit666dee9bd8ed25f8fb368226ecbfeb1cc9284cfb (patch)
tree9453d6b91c64aea7d4686fcd4974a19673c8e847 /pages
parent225abb31443d4bde8be9caaf04ac8a8bb830750b (diff)
parent02493be6eb7426b2814d356283c5877e779f1aea (diff)
downloadmonzero-gui-666dee9bd8ed25f8fb368226ecbfeb1cc9284cfb.tar.gz
monzero-gui-666dee9bd8ed25f8fb368226ecbfeb1cc9284cfb.tar.xz
monzero-gui-666dee9bd8ed25f8fb368226ecbfeb1cc9284cfb.zip
Merge pull request #1916
02493be Bring back paymentID to tranfer page and force hide paymentId on a settings toggle (and reset fields on transfer page) (xmrdsc)
Diffstat (limited to 'pages')
-rw-r--r--pages/Transfer.qml2
-rw-r--r--pages/settings/SettingsLayout.qml1
2 files changed, 2 insertions, 1 deletions
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index dcfa2073..aba47b45 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -306,7 +306,7 @@ Rectangle {
fontSize: paymentIdLine.labelFontSize
iconOnTheLeft: false
Layout.fillWidth: true
- text: qsTr("Payment ID <font size='2'>( Optional )</font>") + translationManager.emptyString
+ text: qsTr("Payment ID <font size='2'>( Optional, deprecated )</font>") + translationManager.emptyString
onClicked: {
if (!paymentIdCheckbox.checked) {
paymentIdLine.text = "";
diff --git a/pages/settings/SettingsLayout.qml b/pages/settings/SettingsLayout.qml
index 83f63845..ec69234f 100644
--- a/pages/settings/SettingsLayout.qml
+++ b/pages/settings/SettingsLayout.qml
@@ -84,6 +84,7 @@ Rectangle {
checked: persistentSettings.showPid
onClicked: {
persistentSettings.showPid = !persistentSettings.showPid
+ middlePanel.transferView.clearFields();
}
text: qsTr("Enable transfer with payment ID (OBSOLETE)") + translationManager.emptyString
}