aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md3
-rw-r--r--app/manifest.json2
-rw-r--r--app/scripts/metamask-controller.js2
-rw-r--r--ui/lib/account-link.js2
4 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3e333e23..129af1281 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
## Current Develop Branch
+## 6.5.2 Wed May 15 2019
+
+- [#6613](https://github.com/MetaMask/metamask-extension/pull/6613): Hardware Wallet Fix
## 6.5.1 Tue May 14 2019
- Fix bug where approve method would show a warning. #6602
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) {
diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js
index f1428ba92..f2e321991 100644
--- a/ui/lib/account-link.js
+++ b/ui/lib/account-link.js
@@ -1,5 +1,5 @@
module.exports = function (address, network, rpcPrefs) {
- if (rpcPrefs.blockExplorerUrl) {
+ if (rpcPrefs && rpcPrefs.blockExplorerUrl) {
return `${rpcPrefs.blockExplorerUrl}/address/${address}`
}