Merge pull request #14028 from jasonrsadler/fix/#14025-pdf-payment

Implemented fix to show publisher toggle for PDFs
brave · May 4, 2018 · 0eef9e1 · 0eef9e1
1 parent c176498
commit 0eef9e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/common/lib/publisherUtil.js b/app/common/lib/publisherUtil.js
@@ -8,17 +8,17 @@ const settings = require('../../../js/constants/settings')
 // Utils
 const ledgerUtil = require('./ledgerUtil')
 const {getSetting} = require('../../../js/settings')
-const {isHttpOrHttps} = require('../../../js/lib/urlutil')
+const {isHttpOrHttps, getUrlFromPDFUrl} = require('../../../js/lib/urlutil')
 const {isSourceAboutUrl} = require('../../../js/lib/appUrlUtil')
 
-const publisherState = {
+const publisherUtil = {
   shouldShowAddPublisherButton: (state, location, publisherKey) => {
     return location &&
       !isSourceAboutUrl(location) &&
       getSetting(settings.PAYMENTS_ENABLED) &&
-      isHttpOrHttps(location) &&
+      isHttpOrHttps(getUrlFromPDFUrl(location)) &&
       !ledgerUtil.blockedP(state, publisherKey)
   }
 }
 
-module.exports = publisherState
+module.exports = publisherUtil
diff --git a/app/renderer/components/navigation/publisherToggle.js b/app/renderer/components/navigation/publisherToggle.js
@@ -18,7 +18,7 @@ const tabState = require('../../../common/state/tabState')
 const ledgerState = require('../../../common/state/ledgerState')
 
 // Utils
-const {getHostPattern} = require('../../../../js/lib/urlutil')
+const {getHostPattern, getUrlFromPDFUrl} = require('../../../../js/lib/urlutil')
 const {getBaseUrl} = require('../../../../js/lib/appUrlUtil')
 const frameStateUtil = require('../../../../js/state/frameStateUtil')
 const ledgerUtil = require('../../../common/lib/ledgerUtil')
@@ -107,7 +107,7 @@ class PublisherToggle extends React.Component {
     const currentWindow = state.get('currentWindow')
     const activeFrame = frameStateUtil.getActiveFrame(currentWindow) || Immutable.Map()
     const tabId = activeFrame.get('tabId', tabState.TAB_ID_NONE)
-    const location = activeFrame.get('location', '')
+    const location = getUrlFromPDFUrl(activeFrame.get('location', ''))
     const locationId = getBaseUrl(location)
     const publisherKey = ledgerState.getVerifiedPublisherLocation(state, locationId)