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)

3 files changed, 3 insertions, 2 deletions

diff --git a/main.qml b/main.qml
index 7de16518..3eb80df1 100644
--- a/main.qml
+++ b/main.qml
@@ -1054,7 +1054,7 @@ ApplicationWindow {
         property bool hideBalance: false
         property bool lockOnUserInActivity: true
         property int lockOnUserInActivityInterval: 10  // minutes
-        property bool showPid: false
+        property bool showPid: true
     }
 
     // Information dialog
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
         }