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 #6616 from MetaMask/develop

Browse Source 
Update master for 6.5.2 production release
This commit is contained in:
Thomas Huang 2019-05-15 09:39:12 -07:00 committed by GitHub
commit 3d7bdd6ecb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 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
## 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 ## 6.5.1 Tue May 14 2019
- Fix bug where approve method would show a warning. #6602 - Fix bug where approve method would show a warning. #6602

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": "6.5.1", "version": "6.5.2",
"manifest_version": 2, "manifest_version": 2,
"author": "https://metamask.io", "author": "https://metamask.io",
"description": "__MSG_appDescription__", "description": "__MSG_appDescription__",

2
app/scripts/metamask-controller.js
View File

@ -343,7 +343,7 @@ module.exports = class MetamaskController extends EventEmitter {
updatePublicConfigStore(this.getState()) updatePublicConfigStore(this.getState())
publicConfigStore.destroy = () => { publicConfigStore.destroy = () => {
this.removeEventListener('update', updatePublicConfigStore) this.removeEventListener && this.removeEventListener('update', updatePublicConfigStore)
} }
function updatePublicConfigStore (memState) { function updatePublicConfigStore (memState) {

2
ui/lib/account-link.js
View File

@ -1,5 +1,5 @@
module.exports = function (address, network, rpcPrefs) { module.exports = function (address, network, rpcPrefs) {
if (rpcPrefs.blockExplorerUrl) { if (rpcPrefs && rpcPrefs.blockExplorerUrl) {
return `${rpcPrefs.blockExplorerUrl}/address/${address}` return `${rpcPrefs.blockExplorerUrl}/address/${address}`
} }