github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2024-12-19 04:45:53 +01:00
Code Releases Activity

Transfer: forbid long Payment IDs

Browse Source
This commit is contained in:
xiphon 2019-09-28 02:00:51 +00:00
parent d3b81cb6f8
commit f72ed257ce
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main.qml
View File

@ -460,10 +460,6 @@ ApplicationWindow {
// Raise window
appWindow.raise();
appWindow.show();
// @TODO: remove after paymentID deprecation
if(params.hasOwnProperty("tx_payment_id"))
persistentSettings.showPid = true;
}
}
@ -1371,7 +1367,6 @@ ApplicationWindow {
property bool lockOnUserInActivity: true
property int walletMode: 2
property int lockOnUserInActivityInterval: 10 // minutes
property bool showPid: false
property bool blackTheme: true
property bool fiatPriceEnabled: false

17
pages/Transfer.qml
View File

@ -269,8 +269,7 @@ Rectangle {
}
}
onTextChanged: {
// @TODO: remove after pid removal hardfork
warningLongPidTransfer = !persistentSettings.showPid && isLongPidService(text)
warningLongPidTransfer = isLongPidService(text);
}
inlineButton.text: FontAwesome.qrcode
inlineButton.fontPixelSize: 22
@ -360,7 +359,7 @@ Rectangle {
}
ColumnLayout {
visible: appWindow.persistentSettings.showPid || paymentIdCheckbox.checked
visible: paymentIdCheckbox.checked
// @TODO: remove after pid removal hardfork
CheckBox {
id: paymentIdCheckbox
@ -383,6 +382,7 @@ Rectangle {
id: paymentIdLine
fontBold: true
placeholderText: qsTr("64 hexadecimal characters") + translationManager.emptyString
readOnly: true
Layout.fillWidth: true
wrapMode: Text.WrapAnywhere
addressValidation: false
@ -394,8 +394,10 @@ Rectangle {
MoneroComponents.WarningBox {
// @TODO: remove after pid removal hardfork
id: paymentIdWarningBox
text: qsTr("You can enable transfers with payment ID on the settings page.") + translationManager.emptyString;
visible: !persistentSettings.showPid && (warningLongPidTransfer || warningLongPidDescription)
text: qsTr("Long payment IDs are obsolete. \
Long payment IDs were not encrypted on the blockchain and would harm your privacy. \
If the party you're sending to still requires a long payment ID, please notify them.") + translationManager.emptyString;
visible: warningLongPidTransfer || paymentIdCheckbox.checked
}
MoneroComponents.WarningBox {
@ -769,6 +771,11 @@ Rectangle {
root.sendButtonWarning = qsTr("Transaction information is incorrect.") + translationManager.emptyString;
return false;
}
if (paymentIdWarningBox.visible) {
return false;
}
return true;
}
}

9
pages/settings/SettingsLayout.qml
View File

@ -68,15 +68,6 @@ Rectangle {
text: qsTr("Hide balance") + translationManager.emptyString
}
MoneroComponents.CheckBox {
id: showPidCheckBox
checked: persistentSettings.showPid
onClicked: {
persistentSettings.showPid = !persistentSettings.showPid
}
text: qsTr("Enable transfer with payment ID (OBSOLETE)") + translationManager.emptyString
}
MoneroComponents.CheckBox {
id: themeCheckbox
checked: !MoneroComponents.Style.blackTheme