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.

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

fix(fxa-settings) remove static list of features + pocket copy [DO NOT MERGE] #12849

Closed
wants to merge 1 commit into from

Conversation

millmason
Copy link
Contributor

@millmason millmason commented May 11, 2022

fix(fxa-settings) Add change to l10n files, remove unused constants

fix(fxa-settings) remove outdated Pocket reference from checklist

fix(fxa-settings): update string id on updated string

Because

  • These commits were merged into main but had to be pulled out so we can wait on Pocket.

This pull request

  • Adds those commits back in in a fresh PR to be merged when the timing is right.

Issue that this pull request solves

Closes: #11578

Checklist

Put an x in the boxes that apply

  • My commit is GPG signed.
  • If applicable, I have modified or added tests which pass locally.
  • I have added necessary documentation (if appropriate).
  • I have verified that my changes render correctly in RTL (if appropriate).

Other information (Optional)

Original PRs: #12790,
#12731

… warning

fix(fxa-settings) Add change to l10n files, remove unused constants

fix(fxa-settings) remove outdated Pocket reference from checklist

fix(fxa-settings): update string id on updated string
@millmason millmason requested a review from a team as a code owner May 11, 2022 22:00
Comment on lines -8 to -9
export const VPNLink = 'https://vpn.mozilla.org/';
export const MonitorLink = 'https://monitor.firefox.com/';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we actually use these in ConnectedServices as well as our Bento menu without referencing these consts. Could be worth leaving these, and changing those references to this const.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

git grep -nE "(monitor.firefox.com|vpn.mozilla.org)" | cat

packages/functional-tests/tests/signin/relyingParties.spec.ts:100:    await page.goto('https://monitor.firefox.com');
packages/functional-tests/tests/signin/relyingParties.spec.ts:106:    expect(page.url()).toMatch('https://monitor.firefox.com/user/dashboard');

packages/fxa-auth-server/test/local/payments/fixtures/stripe/subscription_pmi_expanded_incomplete_cvc_fail.json:47:            "downloadURL": "https://vpn.mozilla.org/vpn/download?utm_medium=email&utm_source=email&utm_campaign=subscription-download",
packages/fxa-auth-server/test/local/payments/fixtures/stripe/subscription_pmi_expanded_incomplete_cvc_fail.json:67:            "downloadURL": "https://vpn.mozilla.org/vpn/download?utm_medium=email&utm_source=email&utm_campaign=subscription-download",
packages/fxa-auth-server/test/local/payments/fixtures/stripe/subscription_pmi_expanded_incomplete_cvc_fail.json:170:              "downloadURL": "https://vpn.mozilla.org/vpn/download?utm_medium=email&utm_source=email&utm_campaign=subscription-download",
packages/fxa-auth-server/test/local/payments/fixtures/stripe/subscription_pmi_expanded_incomplete_cvc_fail.json:190:              "downloadURL": "https://vpn.mozilla.org/vpn/download?utm_medium=email&utm_source=email&utm_campaign=subscription-download",
packages/fxa-auth-server/test/local/payments/fixtures/stripe/subscription_pmi_expanded_incomplete_cvc_fail.json:481:      "downloadURL": "https://vpn.mozilla.org/vpn/download?utm_medium=email&utm_source=email&utm_campaign=subscription-download",

packages/fxa-settings/src/components/BentoMenu/index.tsx:71:                      href="https://monitor.firefox.com"
packages/fxa-settings/src/components/BentoMenu/index.tsx:125:                      href="https://vpn.mozilla.org/?utm_source=accounts.firefox.com&utm_medium=referral&utm_campaign=fxa-settings&utm_content=bento-promo"

packages/fxa-settings/src/components/ConnectedServices/Service.tsx:50:      serviceLink = 'https://monitor.firefox.com/';

packages/fxa-settings/src/components/ConnectedServices/index.test.tsx:141:          'https://monitor.firefox.com/'

@clouserw
Copy link
Member

The schedule for this is undetermined but a ways out. Let's close this for now.

@clouserw clouserw closed this Jul 11, 2022
@millmason millmason deleted the fxa-4419-remove-pocket-copy-and-list branch July 12, 2022 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants