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

Jump to bottom

Fixes rewards disabled for ads #1297

Merged
merged 1 commit into from
Jan 11, 2019
Merged

Fixes rewards disabled for ads #1297

merged 1 commit into from
Jan 11, 2019

Conversation

NejcZdovc
Copy link
Contributor

@NejcZdovc NejcZdovc commented Jan 11, 2019 •
edited
Loading

Resolves brave/brave-browser#2922

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:

  • enable rewards
  • go to settings page
  • disable rewards
  • make sure that you don't see toggle or settings page in ads box

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

@NejcZdovc NejcZdovc self-assigned this Jan 11, 2019
@jasonrsadler
Copy link
Contributor

Should test plan be disable rewards?

@NejcZdovc
Copy link
Contributor Author

@jasonrsadler you are correct, fixed

jasonrsadler
jasonrsadler previously approved these changes Jan 11, 2019
View reviewed changes
@mrose17 mrose17 self-requested a review January 11, 2019 18:42
mrose17
mrose17 approved these changes Jan 11, 2019
View reviewed changes
Copy link
Member

@mrose17 mrose17 left a comment

Choose a reason for hiding this comment

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

LGTM

@NejcZdovc NejcZdovc merged commit c89ce0e into master Jan 11, 2019
@NejcZdovc NejcZdovc deleted the ads-box branch January 11, 2019 18:44
NejcZdovc added a commit that referenced this pull request Jan 11, 2019
@NejcZdovc
Merge pull request #1297 from brave/ads-box
a4b795f 
Fixes rewards disabled for ads
@NejcZdovc NejcZdovc mentioned this pull request Jan 11, 2019
Merged
@ryanml ryanml mentioned this pull request Jan 12, 2019
Closed
@bbondy bbondy added this to the 0.61.x - Nightly milestone Jan 14, 2019
@LaurenWags LaurenWags mentioned this pull request Feb 15, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bridiver bridiver bridiver left review comments

@mrose17 mrose17 mrose17 approved these changes

@jasonrsadler jasonrsadler jasonrsadler left review comments

@ryanml ryanml Awaiting requested review from ryanml

Assignees

@NejcZdovc NejcZdovc

Labels
feature/ads feature/rewards
Projects
None yet
Milestone
0.61.x - Release
Development

Successfully merging this pull request may close these issues.

Ads box should respect rewards status
5 participants
@NejcZdovc @jasonrsadler @bridiver @mrose17 @bbondy