Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Adds option to disable promotions #12314

Merged
merged 1 commit into from
Dec 22, 2017
Merged

Adds option to disable promotions #12314

merged 1 commit into from
Dec 22, 2017

Conversation

NejcZdovc
Copy link
Contributor

@NejcZdovc NejcZdovc commented Dec 18, 2017 •
edited by bsclifton
Loading

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).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.

Resolves #12313

Auditors:

Test Plan:

  • clean profile
  • start brave with LEDGER_VERBOSE
  • as soon as brave starts go to preferences->advance settings and disable promotions (you have 15s to do this)
  • there shouldn't be any requests to get promotions (like https://ledger.mercury.basicattentiontoken.org/v1/grants)

Reviewer Checklist:

Tests

  • Adequate test coverage exists to prevent regressions
  • Tests should be independent and work correctly when run individually or as a suite ref
  • New files have MPL2 license header

@NejcZdovc NejcZdovc added this to the 0.19.x Hotfix 9 milestone Dec 18, 2017
@NejcZdovc NejcZdovc self-assigned this Dec 18, 2017
@NejcZdovc NejcZdovc requested a review from bsclifton December 18, 2017 11:43
@NejcZdovc
Copy link
Contributor Author

this is how options looks like

image

@bsclifton bsclifton modified the milestones: 0.19.x Hotfix 9, 0.21.x (Developer Channel) Dec 20, 2017
@NejcZdovc NejcZdovc modified the milestones: 0.21.x (Developer Channel), 0.20.x (Beta Channel) Dec 21, 2017
@NejcZdovc NejcZdovc mentioned this pull request Dec 21, 2017
Closed
bsclifton
bsclifton reviewed Dec 22, 2017
View reviewed changes
app/extensions/brave/locales/en-US/preferences.properties Outdated
@@ -215,6 +215,7 @@ pageNofMText=Page {{n}} of {{m}}
paintTabs=Show tabs in page theme color
passwordManager=Password Manager
passwordsAndForms=Passwords and Forms
paymentsAllowPromotions=Show BAT promotions
Copy link
Member

Choose a reason for hiding this comment

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

Per comment from @davidtemkin, I believe this should be "token" promotions

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Copy link

Choose a reason for hiding this comment

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

yes, thanks

@NejcZdovc NejcZdovc force-pushed the hotfix/#12313-disable branch from 9abd9dd to 6f2bc99 Compare December 22, 2017 06:28
@NejcZdovc
Adds option to disable promotions
6582ba8 
Resolves brave#12313

Auditors:

Test Plan:
@NejcZdovc NejcZdovc force-pushed the hotfix/#12313-disable branch from 6f2bc99 to 6582ba8 Compare December 22, 2017 17:11
bsclifton
bsclifton approved these changes Dec 22, 2017
View reviewed changes
Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

LGTM 😄 👍

@bsclifton bsclifton merged commit 4028c66 into brave:master Dec 22, 2017
bsclifton added a commit that referenced this pull request Dec 22, 2017
@bsclifton
Merge pull request #12314 from NejcZdovc/hotfix/#12313-disable
e84a17e 
Adds option to disable promotions
bsclifton added a commit that referenced this pull request Dec 22, 2017
@bsclifton
Merge pull request #12314 from NejcZdovc/hotfix/#12313-disable
8b1a5a8 
Adds option to disable promotions
@bsclifton
Copy link
Member

master 4028c66
0.21.x e84a17e
0.20.x 8b1a5a8

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@davidtemkin davidtemkin davidtemkin left review comments

@bsclifton bsclifton bsclifton approved these changes

@bradleyrichter bradleyrichter Awaiting requested review from bradleyrichter

Assignees

@NejcZdovc NejcZdovc

Labels
feature/rewards
Projects
None yet
Milestone
0.20.x (Release Channel)
Development

Successfully merging this pull request may close these issues.
3 participants
@NejcZdovc @bsclifton @davidtemkin