Merge pull request #1865

3c0f269 Transfer: remove ability to transfer with detached short payment ids (selsta)
This commit is contained in:
luigi1111 2019-01-21 14:44:38 -06:00
commit 2207fd5b29
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -307,7 +307,7 @@ Rectangle {
LineEditMulti {
id: paymentIdLine
fontBold: true
placeholderText: qsTr("16 or 64 hexadecimal characters") + translationManager.emptyString
placeholderText: qsTr("64 hexadecimal characters") + translationManager.emptyString
Layout.fillWidth: true
wrapMode: Text.WrapAnywhere
addressValidation: false
@ -395,7 +395,7 @@ Rectangle {
var amount_ok = amount.length > 0
var address_ok = walletManager.addressValid(address, nettype)
var payment_id_ok = payment_id.length == 0 || walletManager.paymentIdValid(payment_id)
var payment_id_ok = payment_id.length == 0 || (payment_id.length == 64 && walletManager.paymentIdValid(payment_id))
var ipid = walletManager.paymentIdFromAddress(address, nettype)
if (ipid.length > 0 && payment_id.length > 0)
payment_id_ok = false