monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-10 21:04:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2632

Browse source 
d6ccae3 Transfer: cleanup payment id code (tobtoht)
This commit is contained in:
luigi1111 2019-12-19 19:50:11 -05:00
commit a6818cd274
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pages/Transfer.qml
View file

@ -54,8 +54,6 @@ Rectangle {
property string sendButtonWarning: "" property string sendButtonWarning: ""
property string startLinkText: qsTr("<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style><font size='2'> (</font><a href='#'>Start daemon</a><font size='2'>)</font>") + translationManager.emptyString property string startLinkText: qsTr("<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style><font size='2'> (</font><a href='#'>Start daemon</a><font size='2'>)</font>") + translationManager.emptyString
property bool showAdvanced: false property bool showAdvanced: false
// @TODO: remove after pid removal hardfork
property bool warningLongPidTransfer: false
property bool warningLongPidDescription: descriptionLine.text.match(/^[0-9a-f]{64}$/i) property bool warningLongPidDescription: descriptionLine.text.match(/^[0-9a-f]{64}$/i)
Clipboard { id: clipboard } Clipboard { id: clipboard }
@ -87,17 +85,6 @@ Rectangle {
paymentIdCheckbox.checked = paymentIdLine.text != ""; paymentIdCheckbox.checked = paymentIdLine.text != "";
} }
function isLongPidService(text) {
// @TODO: remove after pid removal hardfork
return text.length == 95 &&
[ "44tLjmXrQNrWJ5NBsEj2R77ZBEgDa3fEe9GLpSf2FRmhexPvfYDUAB7EXX1Hdb3aMQ9FLqdJ56yaAhiXoRsceGJCRS3Jxkn", // Binance
"4AQ3ZREb53FMYKBmpPn7BD7hphPk6G1ceinQX6gefAvhFJsNbeFsGwebZWCNxoJAbZhD9cjetBAqmLhfXmcNLBpPMsBL6yM", // KuCoin
"47YzEcMrU2S42UitURo7ukUDaSaL485Z1QbmFgq1vSs5g3JesL4rChwWf2uWk1va99JAaRxt65jhX9uAqQnjeFM44ckgZtp", // AnycoinDirect
"4BCeEPhodgPMbPWFN1dPwhWXdRX8q4mhhdZdA1dtSMLTLCEYvAj9QXjXAfF7CugEbmfBhgkqHbdgK9b2wKA6nqRZQCgvCDm", // Bitfinex
"463tWEBn5XZJSxLU6uLQnQ2iY9xuNcDbjLSjkn3XAXHCbLrTTErJrBWYgHJQyrCwkNgYvyV3z8zctJLPCZy24jvb3NiTcTJ" // Bittrex
].indexOf(text) > -1
}
function clearFields() { function clearFields() {
addressLine.text = "" addressLine.text = ""
setPaymentId(""); setPaymentId("");
@ -278,7 +265,6 @@ Rectangle {
amountLine.text = parsed.amount; amountLine.text = parsed.amount;
setDescription(parsed.tx_description); setDescription(parsed.tx_description);
} }
warningLongPidTransfer = isLongPidService(text);
} }
inlineButton.text: FontAwesome.qrcode inlineButton.text: FontAwesome.qrcode
inlineButton.fontPixelSize: 22 inlineButton.fontPixelSize: 22
@ -376,7 +362,6 @@ Rectangle {
ColumnLayout { ColumnLayout {
visible: paymentIdCheckbox.checked visible: paymentIdCheckbox.checked
// @TODO: remove after pid removal hardfork
CheckBox { CheckBox {
id: paymentIdCheckbox id: paymentIdCheckbox
border: false border: false
@ -404,17 +389,17 @@ Rectangle {
wrapMode: Text.WrapAnywhere wrapMode: Text.WrapAnywhere
addressValidation: false addressValidation: false
visible: paymentIdCheckbox.checked visible: paymentIdCheckbox.checked
error: paymentIdCheckbox.checked
} }
} }
} }
MoneroComponents.WarningBox { MoneroComponents.WarningBox {
// @TODO: remove after pid removal hardfork
id: paymentIdWarningBox id: paymentIdWarningBox
text: qsTr("Long payment IDs are obsolete. \ text: qsTr("Long payment IDs are obsolete. \
Long payment IDs were not encrypted on the blockchain and would harm your privacy. \ 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; If the party you're sending to still requires a long payment ID, please notify them.") + translationManager.emptyString;
visible: warningLongPidTransfer || paymentIdCheckbox.checked visible: paymentIdCheckbox.checked || warningLongPidDescription
} }
MoneroComponents.WarningBox { MoneroComponents.WarningBox {