aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorThomas Huang <tmashuang@users.noreply.github.com>2019-05-16 00:39:12 +0800
committerGitHub <noreply@github.com>2019-05-16 00:39:12 +0800
commit3d7bdd6ecb5e8e17cb8ccf83f56ad389971332c1 (patch)
tree6cef1cc8245ebdec8187a517e0c0c480227cbdc1 /app
parentbf5b7f8e77684ce4a66d7e0301ed19d048a545f9 (diff)
parentd6a1c2a3b8e690b0a8a0f7a5feeca7bfeb4e3a2d (diff)
downloadtangerine-wallet-browser-3d7bdd6ecb5e8e17cb8ccf83f56ad389971332c1.tar
tangerine-wallet-browser-3d7bdd6ecb5e8e17cb8ccf83f56ad389971332c1.tar.gz
tangerine-wallet-browser-3d7bdd6ecb5e8e17cb8ccf83f56ad389971332c1.tar.bz2
tangerine-wallet-browser-3d7bdd6ecb5e8e17cb8ccf83f56ad389971332c1.tar.lz
tangerine-wallet-browser-3d7bdd6ecb5e8e17cb8ccf83f56ad389971332c1.tar.xz
tangerine-wallet-browser-3d7bdd6ecb5e8e17cb8ccf83f56ad389971332c1.tar.zst
tangerine-wallet-browser-3d7bdd6ecb5e8e17cb8ccf83f56ad389971332c1.zip
Merge pull request #6616 from MetaMask/develop
Update master for 6.5.2 production release
Diffstat (limited to 'app')
-rw-r--r--app/manifest.json2
-rw-r--r--app/scripts/metamask-controller.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/manifest.json b/app/manifest.json
index 570e5b6cb..2002dee76 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "__MSG_appName__",
"short_name": "__MSG_appName__",
- "version": "6.5.1",
+ "version": "6.5.2",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "__MSG_appDescription__",
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 55ca96ad4..242028c92 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -343,7 +343,7 @@ module.exports = class MetamaskController extends EventEmitter {
updatePublicConfigStore(this.getState())
publicConfigStore.destroy = () => {
- this.removeEventListener('update', updatePublicConfigStore)
+ this.removeEventListener && this.removeEventListener('update', updatePublicConfigStore)
}
function updatePublicConfigStore (memState) {