diff --git a/static-data/www/mail/mail.js b/static-data/www/mail/mail.js index 6f435ad2..b2809441 100755 --- a/static-data/www/mail/mail.js +++ b/static-data/www/mail/mail.js @@ -51,7 +51,7 @@ function openReply(bHash, quote, subject){ } } if (entry.getAttribute('data-nameset') == 'true'){ - document.getElementById('friendSelect').value = entry.getElementsByTagName('input')[0].value + document.getElementById('friendSelect').value = document.getElementById('fromUser').value } key = entry.getAttribute('data-pubkey') document.getElementById('draftID').value = key @@ -86,6 +86,7 @@ function openThread(bHash, sender, date, sigBool, pubkey, subjectLine){ .then((resp) => resp.text()) .then(function(resp) { document.getElementById('fromUser').value = sender || 'Anonymous' + document.getElementById('fromUser').value = pubkey || '' document.getElementById('subjectView').innerText = subjectLine messageDisplay.innerText = resp var sigEl = document.getElementById('sigValid') diff --git a/static-data/www/mail/sendmail.js b/static-data/www/mail/sendmail.js index 7cdebe00..328f8c22 100755 --- a/static-data/www/mail/sendmail.js +++ b/static-data/www/mail/sendmail.js @@ -51,14 +51,6 @@ friendPicker.onchange = function(){ } sendForm.onsubmit = function(){ - if (friendPicker.value.trim().length !== 0 && to.value.trim().length !== 0){ - if (friendPicker.value !== to.value){ - PNotify.error({ - text: 'You have selected both a friend and entered a public key manually.' - }) - return false - } - } if (! to.value.includes("-") && to.value.length !== 56 && to.value.length !== 52){ PNotify.error({ text: 'User ID is not valid'