Skip to content

Commit

Permalink
Fix #862 - Change user email to alias email in delete warning modal m…
Browse files Browse the repository at this point in the history
…essage
  • Loading branch information
codemist committed Jul 8, 2021
1 parent 72b804c commit d82224d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
5 changes: 2 additions & 3 deletions privaterelay/locales/en-US/app.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,9 @@ onboarding-tip-3 = Via the context menu, just right-click (Windows) or Control-c
modal-rename-alias-saved = Label saved!
modal-delete-headline = Permanently delete this alias?
# Variables:
# $attrs (string) - add relay address attribute
modal-delete-warning-recovery-html = Once you delete this alias, it cannot be recovered.
{ -brand-name-firefox-relay } will no longer forward messages sent to <strong { $attrs }></strong>, including messages that allow you to reset lost passwords.
{ -brand-name-firefox-relay } will no longer forward messages sent to <strong></strong>, including messages that allow you to reset lost passwords.
modal-delete-warning-upgrade = If you use this alias to log in to sites you care about,
you should update your login with a different email address before you delete this one.
modal-delete-confirmation = Yes, I want to delete this alias.
Expand Down
2 changes: 1 addition & 1 deletion privaterelay/templates/includes/modal.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="modal modal-content drop-shadow-light">
<h2 class="modal-headline">{% ftlmsg 'modal-delete-headline' %}</h2>
<span class="alias-to-delete demi"></span>
<p class="modal-message">{% ftlmsg 'modal-delete-warning-recovery-html' attrs='class="js-set-relay-address"' %}</p>
<p class="modal-message">{% ftlmsg 'modal-delete-warning-recovery-html' %}</p>
<p class="warning-text delete-tip modal-message">{% ftlmsg 'modal-delete-warning-upgrade' %}</p>
<div class="flx flx-row checkbox-wrapper">
<input type="checkbox" class="checkbox delete-modal" />
Expand Down
3 changes: 2 additions & 1 deletion static/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ function deleteAliasConfirmation(submitEvent) {
addressEl.textContent = aliasToDelete;
});

const aliasToDeleteLabel = document.querySelector(".js-set-relay-address");
// Show alias email address in delete warning modal
const aliasToDeleteLabel = document.querySelector(".modal-message strong");
aliasToDeleteLabel.textContent = aliasToDelete;

confirmDeleteModal.classList.add("show-modal");
Expand Down

0 comments on commit d82224d

Please sign in to comment.