From f91b38ff536aacde09087474759e3f79675d2be5 Mon Sep 17 00:00:00 2001 From: xiphon Date: Tue, 12 Feb 2019 10:41:33 +0000 Subject: [PATCH] Revert "Bring back paymentID to tranfer page and force hide paymentId on a settings toggle (and reset fields on transfer page)" This reverts commit 02493be6eb7426b2814d356283c5877e779f1aea. --- main.qml | 2 +- pages/Transfer.qml | 2 +- pages/settings/SettingsLayout.qml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/main.qml b/main.qml index 3eb80df1..7de16518 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: true + property bool showPid: false } // Information dialog diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 904e0f60..d1912f4e 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -299,7 +299,7 @@ Rectangle { fontSize: paymentIdLine.labelFontSize iconOnTheLeft: false Layout.fillWidth: true - text: qsTr("Payment ID ( Optional, deprecated )") + translationManager.emptyString + text: qsTr("Payment ID ( Optional )") + translationManager.emptyString onClicked: { if (!paymentIdCheckbox.checked) { paymentIdLine.text = ""; diff --git a/pages/settings/SettingsLayout.qml b/pages/settings/SettingsLayout.qml index ec69234f..83f63845 100644 --- 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 }