Merge pull request #6616 from MetaMask/develop

Update master for 6.5.2 production release

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

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__",

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) {

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}`
   }