m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Privacy mode fixes (#6087)

Browse Source 
* Version 5.3.4 RC1

* fix old ui approval screen

* fix error caused by meshtesting iframe

* fix linter errors
This commit is contained in:
Bruno Barbieri 2019-02-01 14:05:46 -05:00 committed by GitHub
parent 015414c31d
commit cc03a7db6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/scripts/controllers/provider-approval.js
View File

@ -28,19 +28,21 @@ class ProviderApprovalController {
if (platform && platform.addMessageListener) {
platform.addMessageListener(({ action = '', force, origin, siteTitle, siteImage }, { tab }) => {
switch (action) {
case 'init-provider-request':
this._handleProviderRequest(origin, siteTitle, siteImage, force, tab.id)
break
case 'init-is-approved':
this._handleIsApproved(origin, tab.id)
break
case 'init-is-unlocked':
this._handleIsUnlocked(tab.id)
break
case 'init-privacy-request':
this._handlePrivacyRequest(tab.id)
break
if (tab && tab.id) {
switch (action) {
case 'init-provider-request':
this._handleProviderRequest(origin, siteTitle, siteImage, force, tab.id)
break
case 'init-is-approved':
this._handleIsApproved(origin, tab.id)
break
case 'init-is-unlocked':
this._handleIsUnlocked(tab.id)
break
case 'init-privacy-request':
this._handlePrivacyRequest(tab.id)
break
}
}
})
}

2
old-ui/app/app.js
View File

@ -219,7 +219,7 @@ App.prototype.renderPrimary = function () {
if (providerRequests && providerRequests.length > 0) {
log.debug('rendering provider API approval screen')
return h(ProviderApproval, { origin: providerRequests[0].origin })
return h(ProviderApproval, { origin: providerRequests[0].origin, tabID: providerRequests[0].tabID })
}
// show current view