Merge pull request #12314 from NejcZdovc/hotfix/#12313-disable

Adds option to disable promotions
brave · Dec 22, 2017 · 4028c66 · 4028c66
2 parents ea04284 + 6582ba8
commit 4028c66
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 0 deletions.
diff --git a/app/browser/api/ledger.js b/app/browser/api/ledger.js
@@ -2418,6 +2418,10 @@ const onMediaPublisher = (state, mediaKey, response, duration, revisited) => {
 }
 
 const getPromotion = (state) => {
+  if (!getSetting(settings.PAYMENTS_ALLOW_PROMOTIONS)) {
+    return
+  }
+
   let tempClient = client
   let paymentId = null
   if (!tempClient) {

diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties
@@ -215,6 +215,7 @@ pageNofMText=Page {{n}} of {{m}}
 paintTabs=Show tabs in page theme color
 passwordManager=Password Manager
 passwordsAndForms=Passwords and Forms
+paymentsAllowPromotions=Notify me about token promotions
 paymentHistoryDueFooterText=Your next contribution is due.
 paymentHistoryFooterText=Your next contribution is {{reconcileDate}}.
 paymentHistoryIcon.title=Your Payment History

diff --git a/app/renderer/components/preferences/advancedTab.js b/app/renderer/components/preferences/advancedTab.js
@@ -100,6 +100,7 @@ class AdvancedTab extends ImmutableComponent {
           <SettingCheckbox dataL10nId='useSmoothScroll' prefKey={settings.SMOOTH_SCROLL_ENABLED} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
           <SettingCheckbox dataL10nId='sendCrashReports' prefKey={settings.SEND_CRASH_REPORTS} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
           <SettingCheckbox dataL10nId='sendUsageStatistics' prefKey={settings.SEND_USAGE_STATISTICS} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
+          <SettingCheckbox dataL10nId='paymentsAllowPromotions' prefKey={settings.PAYMENTS_ALLOW_PROMOTIONS} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
         </SettingsList>
 
         <DefaultSectionTitle data-l10n-id='toolbarUserInterfaceScale' />

diff --git a/js/constants/appConfig.js b/js/constants/appConfig.js
@@ -210,6 +210,7 @@ module.exports = {
     'advanced.send-usage-statistics': false,
     'advanced.toolbar-ui-scale': 'normal',
     'advanced.swipe-nav-distance': 101,
+    'advanced.payments-allow-promotions': true,
     'shutdown.clear-history': false,
     'shutdown.clear-downloads': false,
     'shutdown.clear-cache': false,

diff --git a/js/constants/settings.js b/js/constants/settings.js
@@ -81,6 +81,7 @@ const settings = {
   ADBLOCK_CUSTOM_RULES: 'adblock.customRules',
   TOOLBAR_UI_SCALE: 'advanced.toolbar-ui-scale',
   SWIPE_NAV_DISTANCE: 'advanced.swipe-nav-distance',
+  PAYMENTS_ALLOW_PROMOTIONS: 'advanced.payments-allow-promotions',
   // Sync settings
   SYNC_ENABLED: 'sync.enabled',
   SYNC_DEVICE_NAME: 'sync.device-name',

diff --git a/test/unit/app/browser/api/ledgerTest.js b/test/unit/app/browser/api/ledgerTest.js
@@ -35,6 +35,7 @@ describe('ledger api unit tests', function () {
   let contributionAmount = 25
   let paymentsMinVisitTime = 5000
   let paymentsNotifications = true
+  let paymentsAllowPromotions = true
 
   // spies
   let ledgerTransitionSpy
@@ -77,6 +78,8 @@ describe('ledger api unit tests', function () {
             return paymentsMinVisitTime
           case settings.PAYMENTS_NOTIFICATIONS:
             return paymentsNotifications
+          case settings.PAYMENTS_ALLOW_PROMOTIONS:
+            return paymentsAllowPromotions
         }
         return false
       }
@@ -1376,6 +1379,14 @@ describe('ledger api unit tests', function () {
       ledgerClient.reset()
     })
 
+    it('promotions are disabled', function () {
+      paymentsAllowPromotions = false
+      ledgerApi.getPromotion(defaultAppState)
+      assert(ledgerClient.notCalled)
+      assert(ledgergetPromotionSpy.notCalled)
+      paymentsAllowPromotions = true
+    })
+
     it('empty client', function () {
       const oldClient = ledgerApi.getClient()
       ledgerApi.setClient(undefined)