Adds non-verified option to the payment page

Resolves brave#8231 Auditors: @mrose17 @bsclifton Test Plan: - go to payments page - click on advance settings - disabled option "Allow contributions to non-verified sites" - all non-verified sites should be hidden from a table
NejcZdovc · Apr 23, 2017 · 798f177 · 798f177
1 parent b2e4b71
commit 798f177
Show file tree

Hide file tree

Showing 9 changed files with 93 additions and 18 deletions.
diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties
@@ -127,6 +127,7 @@ on=on
 ok=Ok
 autoSuggestSites=auto-include
 notifications=Show notifications
+nonVerifiedPublishers=Allow contributions to non-verified sites
 moneyAdd=Use your debit/credit card
 moneyAddSubTitle=No Bitcoin needed!
 outsideUSAPayment=Buy Bitcoin at our recommended source

diff --git a/app/ledger.js b/app/ledger.js
@@ -75,6 +75,12 @@ let ledgerClient = null
 let ledgerGeoIP = null
 let ledgerPublisher = null
 
+// testing data
+const testVerifiedPublishers = [
+  'brianbondy.com',
+  'clifton.io'
+]
+
 // TBD: remove these post beta [MTR]
 const logPath = 'ledger-log.json'
 const publisherPath = 'ledger-publisher.json'
@@ -187,6 +193,11 @@ const doAction = (action) => {
           updatePublisherInfo()
           break
 
+        case settings.PAYMENTS_NON_VERIFIED:
+          synopsis.options.showOnlyVerified = action.value
+          updatePublisherInfo()
+          break
+
         default:
           break
       }
@@ -1040,11 +1051,21 @@ var eligibleP = (publisher) => {
 }
 
 var visibleP = (publisher) => {
+  if (synopsis.options.showOnlyVerified === undefined) {
+    synopsis.options.showOnlyVerified = getSetting(settings.PAYMENTS_NON_VERIFIED)
+  }
+
+  const onlyVerified = !synopsis.options.showOnlyVerified
+
   return (
       eligibleP(publisher) &&
       (
         synopsis.publishers[publisher].options.exclude !== true ||
         stickyP(publisher)
+      ) &&
+      (
+        (onlyVerified && synopsis.publishers[publisher].options && synopsis.publishers[publisher].options.verified) ||
+        !onlyVerified
       )
     ) &&
     !blockedP(publisher)
@@ -1161,18 +1182,25 @@ var synopsisNormalizer = (changedPublisher) => {
 
   // round if over 100% of pinned publishers
   if (pinnedTotal > 100) {
-    const changedObject = dataPinned.filter(publisher => publisher.site === changedPublisher)[0]
-    const setOne = changedObject.pinPercentage > (100 - dataPinned.length - 1)
+    if (changedPublisher) {
+      const changedObject = dataPinned.filter(publisher => publisher.site === changedPublisher)[0]
+      const setOne = changedObject.pinPercentage > (100 - dataPinned.length - 1)
 
-    if (setOne) {
-      changedObject.pinPercentage = 100 - dataPinned.length + 1
-      changedObject.weight = changedObject.pinPercentage
-    }
+      if (setOne) {
+        changedObject.pinPercentage = 100 - dataPinned.length + 1
+        changedObject.weight = changedObject.pinPercentage
+      }
 
-    const pinnedRestTotal = pinnedTotal - changedObject.pinPercentage
-    dataPinned = dataPinned.filter(publisher => publisher.site !== changedPublisher)
-    dataPinned = normalizePinned(dataPinned, pinnedRestTotal, (100 - changedObject.pinPercentage), setOne)
-    dataPinned = roundToTarget(dataPinned, (100 - changedObject.pinPercentage), 'pinPercentage')
+      const pinnedRestTotal = pinnedTotal - changedObject.pinPercentage
+      dataPinned = dataPinned.filter(publisher => publisher.site !== changedPublisher)
+      dataPinned = normalizePinned(dataPinned, pinnedRestTotal, (100 - changedObject.pinPercentage), setOne)
+      dataPinned = roundToTarget(dataPinned, (100 - changedObject.pinPercentage), 'pinPercentage')
+
+      dataPinned.push(changedObject)
+    } else {
+      dataPinned = normalizePinned(dataPinned, pinnedTotal, 100)
+      dataPinned = roundToTarget(dataPinned, 100, 'pinPercentage')
+    }
 
     dataUnPinned = dataUnPinned.map((result) => {
       let publisher = getPublisherData(result)
@@ -1181,8 +1209,6 @@ var synopsisNormalizer = (changedPublisher) => {
       return publisher
     })
 
-    dataPinned.push(changedObject)
-
     // sync app store
     appActions.changeLedgerPinnedPercentages(dataPinned)
   } else if (dataUnPinned.length === 0 && pinnedTotal < 100) {
@@ -1388,6 +1414,19 @@ var excludeP = (publisher, callback) => {
 
 var verifiedP = (publisher, callback) => {
   inspectP(v2PublishersDB, v2PublishersPath, publisher, 'verified', null, callback)
+
+  if (process.env.NODE_ENV === 'test') {
+    testVerifiedPublishers.forEach((publisher) => {
+      if (synopsis.publishers[publisher]) {
+        if (!synopsis.publishers[publisher].options) {
+          synopsis.publishers[publisher].options = {}
+        }
+
+        synopsis.publishers[publisher].options.verified = true
+      }
+    })
+    updatePublisherInfo()
+  }
 }
 
 var inspectP = (db, path, publisher, property, key, callback) => {
@@ -1486,6 +1525,7 @@ var ledgerInfo = {
   // advanced ledger settings
   minPublisherDuration: undefined,
   minPublisherVisits: undefined,
+  showOnlyVerified: undefined,
 
   hasBitcoinHandler: false,
 

diff --git a/app/renderer/components/preferences/payment/advancedSettings.js b/app/renderer/components/preferences/payment/advancedSettings.js
@@ -63,10 +63,21 @@ class AdvancedSettingsContent extends ImmutableComponent {
             listClassName={css(styles.list)}
           >
             <SettingCheckbox
+              dataTestId='payment-advance-notifications'
               dataL10nId='notifications'
               prefKey={settings.PAYMENTS_NOTIFICATIONS}
               settings={this.props.settings}
               onChangeSetting={this.props.onChangeSetting}
+              className={css(styles.listItem)}
+              switchClassName={css(styles.checkboxSwitch)}
+              labelClassName={css(commonStyles.noMarginBottom)}
+            />
+            <SettingCheckbox
+              dataTestId='payment-advance-nonverified'
+              dataL10nId='nonVerifiedPublishers'
+              prefKey={settings.PAYMENTS_NON_VERIFIED}
+              settings={this.props.settings}
+              onChangeSetting={this.props.onChangeSetting}
               className={css(styles.listItem, commonStyles.noMarginBottom)}
               switchClassName={css(styles.checkboxSwitch)}
               labelClassName={css(commonStyles.noMarginBottom)}

diff --git a/app/renderer/components/settings.js b/app/renderer/components/settings.js
@@ -94,7 +94,7 @@ class SettingCheckbox extends ImmutableComponent {
 
     })
 
-    return <div {...props}>
+    return <div {...props} data-test-id={this.props.dataTestId}>
       <SwitchControl id={this.props.prefKey}
         small={this.props.small}
         disabled={this.props.disabled}

diff --git a/js/constants/appConfig.js b/js/constants/appConfig.js
@@ -149,6 +149,7 @@ module.exports = {
     'bookmarks.toolbar.showOnlyFavicon': false,
     'payments.enabled': false,
     'payments.notifications': false,
+    'payments.non-verified-publishers': true,
     // "Add funds to your wallet" -- Limit to once every n days to reduce nagging.
     'payments.notification-add-funds-timestamp': null,
     // "Out of money, pls add" / "In 24h we'll pay publishers [Review]"

diff --git a/js/constants/settings.js b/js/constants/settings.js
@@ -55,6 +55,7 @@ const settings = {
   PAYMENTS_NOTIFICATION_RECONCILE_SOON_TIMESTAMP: 'notification-reconcile-soon-timestamp',
   PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED: 'payments.notificationTryPaymentsDismissed',
   PAYMENTS_CONTRIBUTION_AMOUNT: 'payments.contribution-amount',
+  PAYMENTS_NON_VERIFIED: 'payments.non-verified-publishers',
   // Advanced settings
   HARDWARE_ACCELERATION_ENABLED: 'advanced.hardware-acceleration-enabled',
   PDFJS_ENABLED: 'advanced.pdfjs-enabled',

diff --git a/test/about/ledgerTableTest.js b/test/about/ledgerTableTest.js
@@ -1,13 +1,21 @@
 /* global describe, it, beforeEach */
 
 const Brave = require('../lib/brave')
-const {urlInput, addFundsButton, paymentsWelcomePage, paymentsTab, walletSwitch} = require('../lib/selectors')
+const {
+  urlInput,
+  addFundsButton,
+  paymentsWelcomePage,
+  paymentsTab,
+  walletSwitch,
+  advancedSettingsDialog,
+  advancedSettingsButton
+} = require('../lib/selectors')
 
 const ledgerAPIWaitTimeout = 20000
 const prefsUrl = 'about:preferences'
 const sites = [
   'http://example.com/',
-  'https://www.eff.org/'
+  'https://brianbondy.com/'
 ]
 const sites2 = [
   'http://example.com/',
@@ -161,6 +169,17 @@ describe('Ledger table', function () {
         .click(`${secondTableSecondRow} .switchBackground`)
         .waitForInputText(`${firstTableFirstRow} [data-test-id="pinnedInput"]`, '100')
     })
+
+    it('toggle non-verified option', function * () {
+      yield this.app.client
+        .tabByIndex(0)
+        .click(advancedSettingsButton)
+        .waitForVisible(advancedSettingsDialog)
+        .click('[data-test-id="payment-advance-nonverified"] .switchBackground')
+        .click('[data-l10n-id="done"]')
+        .waitForElementCount(advancedSettingsDialog, 0)
+        .waitForElementCount(`${secondTable} tr`, 1)
+    })
   })
 
   describe('4 publishers', function () {

diff --git a/test/lib/selectors.js b/test/lib/selectors.js
@@ -69,12 +69,12 @@ module.exports = {
   syncSwitch: '.syncContainer .switchBackground',
   walletSwitch: '[data-test-id="enablePaymentsSwitch"] .switchBackground',
   addFundsButton: '[data-test2-id="addFunds"]',
-  advancedSettings: '[data-l10n-id="advancedSettings"]',
   fundsSelectBox: '[data-test-id="fundsSelectBox"]',
   paymentsStatus: '[data-test-id="walletStatus"]',
   siteSettingItem: '.siteSettingItem',
   ledgerTable: '[data-test-id="ledgerTable"]',
   bitcoinDashboard: '[data-test-id="bitcoinDashboard"]',
+  advancedSettingsDialog: '[data-test-id="advancedSettings"]',
   advancedSettingsButton: '[data-test-id="advancedSettingsButton"]',
   backupWallet: '[data-l10n-id="backupLedger"]',
   recoverWallet: '[data-l10n-id="recoverLedger"]',

diff --git a/test/unit/app/renderer/paymentsTabTest.js b/test/unit/app/renderer/paymentsTabTest.js
@@ -10,6 +10,8 @@ const Immutable = require('immutable')
 const fakeElectron = require('../../lib/fakeElectron')
 const fakeSettings = require('../../lib/fakeSettings')
 const {btcToCurrencyString} = require('../../../../app/common/lib/ledgerUtil')
+const {advancedSettingsDialog} = require('../../../lib/selectors')
+
 let PaymentsTab, EnabledContent
 require('../../braveUnit')
 
@@ -221,7 +223,7 @@ describe('PaymentsTab component', function () {
           hideOverlay={function () {}}
           ledgerData={Immutable.Map()} />
       )
-      assert.equal(wrapper.find('[data-test-id="advancedSettings"]').length, 1)
+      assert.equal(wrapper.find(advancedSettingsDialog).length, 1)
       assert.equal(wrapper.find('[data-test-id="durationSelector"]').node.value, 8000)
     })
 
@@ -234,7 +236,7 @@ describe('PaymentsTab component', function () {
           hideOverlay={function () {}}
           ledgerData={Immutable.Map()} />
       )
-      assert.equal(wrapper.find('[data-test-id="advancedSettings"]').length, 1)
+      assert.equal(wrapper.find(advancedSettingsDialog).length, 1)
       assert.equal(wrapper.find('[data-test-id="visitSelector"]').node.value, 1)
     })
   })