Merge pull request #1936

f91b38f Revert 02493be (xiphon)
2019-02-14 11:18:07 -06:00
parent b1ae99c3df f91b38ff53
commit 0064e595c3
3 changed files with 2 additions and 3 deletions
--- 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: true
+        property bool showPid: false
    }

    // Information dialog
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -302,7 +302,7 @@ Rectangle {
              fontSize: paymentIdLine.labelFontSize
              iconOnTheLeft: false
              Layout.fillWidth: true
-              text: qsTr("Payment ID <font size='2'>( Optional, deprecated )</font>") + translationManager.emptyString
+              text: qsTr("Payment ID <font size='2'>( Optional )</font>") + translationManager.emptyString
              onClicked: {
                  if (!paymentIdCheckbox.checked) {
                    paymentIdLine.text = "";
--- a/pages/settings/SettingsLayout.qml
+++ b/pages/settings/SettingsLayout.qml
@@ -84,7 +84,6 @@ Rectangle {
            checked: persistentSettings.showPid
            onClicked: {
                persistentSettings.showPid = !persistentSettings.showPid
-                middlePanel.transferView.clearFields();
            }
            text: qsTr("Enable transfer with payment ID (OBSOLETE)") + translationManager.emptyString
        }