diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/images/icon-32.png | bin | 0 -> 1730 bytes | |||
-rw-r--r-- | app/images/icon-64.png | bin | 0 -> 3573 bytes | |||
-rw-r--r-- | app/manifest.json | 7 | ||||
-rw-r--r-- | app/scripts/lib/notifications.js | 2 | ||||
-rw-r--r-- | app/scripts/metamask-controller.js | 22 |
5 files changed, 10 insertions, 21 deletions
diff --git a/app/images/icon-32.png b/app/images/icon-32.png Binary files differnew file mode 100644 index 000000000..f801ebb6b --- /dev/null +++ b/app/images/icon-32.png diff --git a/app/images/icon-64.png b/app/images/icon-64.png Binary files differnew file mode 100644 index 000000000..b3019ad65 --- /dev/null +++ b/app/images/icon-64.png diff --git a/app/manifest.json b/app/manifest.json index 0db9b2b83..6f0eacf77 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "2.13.1", + "version": "2.13.2", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", @@ -10,7 +10,7 @@ "suggested_key": { "windows": "Alt+Shift+M", "mac": "Alt+Shift+M", - "chromeos": "Search+M", + "chromeos": "Alt+Shift+M", "linux": "Alt+Shift+M" } } @@ -55,9 +55,10 @@ } ], "permissions": [ - "notifications", "storage", "tabs", + "clipboardWrite", + "clipboardRead", "http://localhost:8545/" ], "web_accessible_resources": [ diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js index 422f46f6d..cd7535232 100644 --- a/app/scripts/lib/notifications.js +++ b/app/scripts/lib/notifications.js @@ -1,5 +1,5 @@ const extension = require('./extension') -const height = 500 +const height = 520 const width = 360 const notifications = { diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 9e1a885ae..03082013a 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -203,26 +203,15 @@ module.exports = class MetamaskController { newUnsignedTransaction (txParams, onTxDoneCb) { const idStore = this.idStore - var state = idStore.getState() let err = this.enforceTxValidations(txParams) if (err) return onTxDoneCb(err) - // It's locked - if (!state.isUnlocked) { - - // Allow the environment to define an unlock message. - this.opts.unlockAccountMessage() - idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, noop) - - // It's unlocked - } else { - idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => { - if (err) return onTxDoneCb(err) - this.sendUpdate() - this.opts.showUnconfirmedTx(txParams, txData, onTxDoneCb) - }) - } + idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => { + if (err) return onTxDoneCb(err) + this.sendUpdate() + this.opts.showUnconfirmedTx(txParams, txData, onTxDoneCb) + }) } enforceTxValidations (txParams) { @@ -353,4 +342,3 @@ module.exports = class MetamaskController { } } -function noop () {} |