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

Merge pull request #7428 from MetaMask/Version-v7.5.2

Browse Source 
Version v7.5.2 RC
This commit is contained in:
Thomas Huang 2019-11-14 12:27:56 -08:00 committed by GitHub
commit 1e609e8518
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -2,6 +2,9 @@
## Current Develop Branch ## Current Develop Branch
## 7.5.2 Thu Nov 14 2019
- [#7414](https://github.com/MetaMask/metamask-extension/pull/7414): Ensure SignatureRequestOriginal 'beforeunload' handler is bound
## 7.5.1 Tuesday Nov 13 2019 ## 7.5.1 Tuesday Nov 13 2019
- [#7402](https://github.com/MetaMask/metamask-extension/pull/7402): Fix regression for signed types data screens - [#7402](https://github.com/MetaMask/metamask-extension/pull/7402): Fix regression for signed types data screens
- [#7390](https://github.com/MetaMask/metamask-extension/pull/7390): Update json-rpc-engine - [#7390](https://github.com/MetaMask/metamask-extension/pull/7390): Update json-rpc-engine

2
app/manifest.json
View File

@ -1,7 +1,7 @@
{ {
"name": "__MSG_appName__", "name": "__MSG_appName__",
"short_name": "__MSG_appName__", "short_name": "__MSG_appName__",
"version": "7.5.1", "version": "7.5.2",
"manifest_version": 2, "manifest_version": 2,
"author": "https://metamask.io", "author": "https://metamask.io",
"description": "__MSG_appDescription__", "description": "__MSG_appDescription__",

5
ui/app/components/app/signature-request-original.js
View File

@ -101,9 +101,10 @@ function SignatureRequest (props) {
this.state = { this.state = {
selectedAccount: props.selectedAccount, selectedAccount: props.selectedAccount,
} }
this._beforeUnload = this._beforeUnload.bind(this)
} }
SignatureRequest.prototype._beforeUnload = (event) => { SignatureRequest.prototype._beforeUnload = function (event) {
const { clearConfirmTransaction, cancel } = this.props const { clearConfirmTransaction, cancel } = this.props
const { metricsEvent } = this.context const { metricsEvent } = this.context
metricsEvent({ metricsEvent({
@ -117,7 +118,7 @@ SignatureRequest.prototype._beforeUnload = (event) => {
cancel(event) cancel(event)
} }
SignatureRequest.prototype._removeBeforeUnload = () => { SignatureRequest.prototype._removeBeforeUnload = function () {
if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_NOTIFICATION) { if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_NOTIFICATION) {
window.removeEventListener('beforeunload', this._beforeUnload) window.removeEventListener('beforeunload', this._beforeUnload)
} }