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

Updates ads disabled content, bumps brave-ui #1283

Merged
merged 1 commit into from
Jan 10, 2019
Merged

Conversation

ryanml
Copy link
Contributor

@ryanml ryanml commented Jan 10, 2019

Fixes: brave/brave-browser#2846

Removes unnecessary icons, brave-ui update includes changes to the DisabledContent component

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

  1. Navigate to brave://rewards with Ads disabled
  2. Confirm that "Coming Soon" is removed and replaced with new copy per design
  3. Confirm latest megaphone icon per design is being used

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@ryanml ryanml merged commit cad42d8 into brave:master Jan 10, 2019
@ryanml ryanml deleted the fix-2846 branch January 10, 2019 11:55
@bbondy bbondy added this to the 0.61.x - Nightly milestone Jan 14, 2019
@ryanml ryanml mentioned this pull request Jan 25, 2019
18 tasks
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.

Ads box on Rewards Settings page should use disabled content from new design
3 participants