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

Updated labels for Shields v2 panel #12775

Merged
merged 1 commit into from
Mar 30, 2022
Merged

Updated labels for Shields v2 panel #12775

merged 1 commit into from
Mar 30, 2022

Conversation

nullhook
Copy link
Contributor

@nullhook nullhook commented Mar 28, 2022

Resolves brave/brave-browser#21916
Resolves brave/brave-browser#21926

image

image

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@github-actions github-actions bot added the CI/storybook-url Deploy storybook and provide a unique URL for each build label Mar 28, 2022
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@nullhook nullhook requested a review from petemill March 28, 2022 03:05
@rebron rebron requested a review from pes10k March 28, 2022 16:22
@Tonev
Copy link
Contributor

Tonev commented Mar 28, 2022

@nullhook

I see things that should be changed. Do you mind if I propose changes, that could possibly save you from future extra work on the same stuff?

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

braveShieldsTrackersAndAdsBlockedStd: 'Trackers & ads blocked (standard)',
braveShieldsTrackersAndAdsBlockedAgg: 'Trackers & ads blocked (aggressive)',
braveShieldsTrackersAndAdsBlockedStd: 'Block trackers & ads',
braveShieldsTrackersAndAdsBlockedAgg: 'Aggressively block trackers & ads blocked',
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
braveShieldsTrackersAndAdsBlockedAgg: 'Aggressively block trackers & ads blocked',
braveShieldsTrackersAndAdsBlockedAgg: 'Aggressively block trackers & ads',

braveShieldsCookiesBlocked: 'Cookies blocked',
braveShieldsCookiesBlockedAll: 'All cookies blocked',
braveShieldsCookiesBlockedAll: 'Allow all cookies',
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
braveShieldsCookiesBlockedAll: 'Allow all cookies',
braveShieldsCookiesBlockedAll: 'Block all cookies',

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

Copy link
Contributor

@pes10k pes10k left a comment

Choose a reason for hiding this comment

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

lgtm!

@nullhook nullhook merged commit 4be5af4 into master Mar 30, 2022
@nullhook nullhook deleted the shields_strings branch March 30, 2022 03:17
@nullhook nullhook added this to the 1.39.x - Nightly milestone Mar 30, 2022
nullhook added a commit that referenced this pull request Apr 6, 2022
Updated labels for Shields v2 panel
@nullhook nullhook mentioned this pull request Apr 6, 2022
7 tasks
@stephendonner
Copy link
Contributor

For brave/brave-browser#21916

Verified PASSED using

Brave 1.39.39 Chromium: 100.0.4896.79 (Official Build) nightly (x86_64)
Revision 8fb749dcab8700c24213791969e59deb72fee36f-refs/branch-heads/4896@{#1015}
OS macOS Version 11.6.5 (Build 20G527)

Confirmed labels match Figma.

Figma nightly
Screen Shot 2022-04-07 at 2 48 00 PM Screen Shot 2022-04-07 at 2 48 25 PM

For brave/brave-browser#21926

Confirmed the following:

  • updated brave://settings/shields to support Shields v2
  • update settings/text/drop down labels to match Shields v2
  • removed the Default view section which no longer applies
  • reordered cookie and fingerprint blocking so that fingerprint blocking is before (or on top) of cookie blocking to match Shields v2
beta nightly
Screen Shot 2022-04-07 at 2 59 48 PM Screen Shot 2022-04-07 at 3 02 07 PM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/storybook-url Deploy storybook and provide a unique URL for each build
Projects
None yet
6 participants