Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "fix(fxa-settings) remove static list of feature from account deletion…" #12837

Merged
merged 1 commit into from
May 11, 2022
Merged

Revert "fix(fxa-settings) remove static list of feature from account deletion…" #12837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/fxa-settings/src/components/PageDeleteAccount/en-US.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ delete-account-header =
delete-account-step-1-2 = Step 1 of 2
delete-account-step-2-2 = Step 2 of 2

delete-account-confirm-title-2 = You’ve connected your { -product-firefox-account } to { -brand-mozilla } products that keep you secure and productive on the web.
delete-account-confirm-title-2 = You’ve connected your { -product-firefox-account } to { -brand-mozilla } products that keep you secure and productive on the web:

delete-account-acknowledge = Please acknowledge that by deleting your account:

delete-account-chk-box-1-v3 =
.label = Any paid subscriptions you have will be canceled
delete-account-chk-box-1-v2 =
.label = Any paid subscriptions you have will be canceled (Except { product-pocket })
delete-account-chk-box-2 =
.label = You may lose saved information and features within { -brand-mozilla } products
delete-account-chk-box-3 =
Expand Down
22 changes: 19 additions & 3 deletions packages/fxa-settings/src/components/PageDeleteAccount/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useAccount, useAlertBar } from '../../models';
import InputPassword from '../InputPassword';
import FlowContainer from '../FlowContainer';
import VerifiedSessionGuard from '../VerifiedSessionGuard';
import { HomePath, ROOTPATH } from '../../constants';
import { HomePath, MonitorLink, ROOTPATH, VPNLink } from '../../constants';
import { logViewEvent, usePageViewEvent } from '../../lib/metrics';
import { Checkbox } from '../Checkbox';
import { useLocalization } from '@fluent/react';
Expand All @@ -21,7 +21,7 @@ type FormData = {
};

const checkboxLabels = [
'delete-account-chk-box-1-v3',
'delete-account-chk-box-1-v2',
'delete-account-chk-box-2',
'delete-account-chk-box-3',
'delete-account-chk-box-4',
Expand Down Expand Up @@ -115,9 +115,25 @@ export const PageDeleteAccount = (_: RouteComponentProps) => {
<Localized id="delete-account-confirm-title-2">
<p className="mb-4">
You've connected your Firefox account to Mozilla products that
keep you secure and productive on the web.
keep you secure and productive on the web:
</p>
</Localized>
<div className="p-2">
<ul className="list-inside mb-4">
<li className="list-disc">
<a className="link-blue" href={VPNLink}>
<Localized id="product-mozilla-vpn">Mozilla VPN</Localized>
</a>
</li>
<li className="list-disc">
<a className="link-blue" href={MonitorLink}>
<Localized id="product-firefox-monitor">
Firefox Monitor
</Localized>
</a>
</li>
</ul>
</div>
<Localized id="delete-account-acknowledge">
<p className="mb-4">
Please acknowledge that by deleting your account:
Expand Down
2 changes: 2 additions & 0 deletions packages/fxa-settings/src/constants/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@
export const ROOTPATH = '/';
export const HomePath = '/settings';
export const DeleteAccountPath = '/settings/delete_account';
export const VPNLink = 'https://vpn.mozilla.org/';
export const MonitorLink = 'https://monitor.firefox.com/';