diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-08-10 06:39:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-10 06:39:48 +0800 |
| commit | ef7e638dda63a715c796c210dadbe82430537b6a (patch) | |
| tree | 23b5b62ac378f5cc302a0d9019fba8a7c622cf04 /app/scripts/lib | |
| parent | 0601df9dae488d997277bb6b52c28df27546e27c (diff) | |
| parent | 06633da1b395829b475ccafb429af040256d863c (diff) | |
| download | tangerine-wallet-browser-4.9.2.1.tar tangerine-wallet-browser-4.9.2.1.tar.gz tangerine-wallet-browser-4.9.2.1.tar.bz2 tangerine-wallet-browser-4.9.2.1.tar.lz tangerine-wallet-browser-4.9.2.1.tar.xz tangerine-wallet-browser-4.9.2.1.tar.zst tangerine-wallet-browser-4.9.2.1.zip | |
Merge pull request #5025 from MetaMask/v4.9.2v4.9.2.1
v4.9.2
Diffstat (limited to 'app/scripts/lib')
| -rw-r--r-- | app/scripts/lib/ipfsContent.js | 6 | ||||
| -rw-r--r-- | app/scripts/lib/setupRaven.js | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/scripts/lib/ipfsContent.js b/app/scripts/lib/ipfsContent.js index 5222151ea..5db63f47d 100644 --- a/app/scripts/lib/ipfsContent.js +++ b/app/scripts/lib/ipfsContent.js @@ -5,7 +5,7 @@ module.exports = function (provider) { function ipfsContent (details) { const name = details.url.substring(7, details.url.length - 1) let clearTime = null - extension.tabs.getSelected(null, tab => { + extension.tabs.query({active: true}, tab => { extension.tabs.update(tab.id, { url: 'loading.html' }) clearTime = setTimeout(() => { @@ -34,11 +34,11 @@ module.exports = function (provider) { return { cancel: true } } - extension.webRequest.onBeforeRequest.addListener(ipfsContent, {urls: ['*://*.eth/', '*://*.test/']}) + extension.webRequest.onErrorOccurred.addListener(ipfsContent, {urls: ['*://*.eth/', '*://*.test/']}) return { remove () { - extension.webRequest.onBeforeRequest.removeListener(ipfsContent) + extension.webRequest.onErrorOccurred.removeListener(ipfsContent) }, } } diff --git a/app/scripts/lib/setupRaven.js b/app/scripts/lib/setupRaven.js index e657e278f..3651524f1 100644 --- a/app/scripts/lib/setupRaven.js +++ b/app/scripts/lib/setupRaven.js @@ -8,7 +8,7 @@ module.exports = setupRaven // Setup raven / sentry remote error reporting function setupRaven (opts) { - const { releaseVersion } = opts + const { release } = opts let ravenTarget // detect brave const isBrave = Boolean(window.chrome.ipcRenderer) @@ -22,7 +22,7 @@ function setupRaven (opts) { } const client = Raven.config(ravenTarget, { - releaseVersion, + release, transport: function (opts) { opts.data.extra.isBrave = isBrave const report = opts.data |