aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md8
-rw-r--r--app/images/icon-32.pngbin0 -> 1730 bytes
-rw-r--r--app/images/icon-64.pngbin0 -> 3573 bytes
-rw-r--r--app/manifest.json7
-rw-r--r--app/scripts/lib/notifications.js2
-rw-r--r--app/scripts/metamask-controller.js22
-rw-r--r--development/announcer.js12
-rw-r--r--package.json5
-rw-r--r--ui/app/components/account-export.js9
-rw-r--r--ui/app/first-time/create-vault-complete.js1
10 files changed, 40 insertions, 26 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84a074480..0ab4166cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,15 @@
## Current Master
+- Decreased vault confirmation button font size to help some Linux users who could not see it.
+- Made popup a little taller because it would sometimes cut off buttons.
+
+## 2.13.2 2016-10-4
+
- Fix bug where chosen FIAT exchange rate does no persist when switching networks
+- Fix additional parameters that made MetaMask sometimes receive errors from Parity.
+- Fix bug where invalid transactions would still open the MetaMask popup.
+- Removed hex prefix from private key export, to increase compatibility with Geth, MyEtherWallet, and Jaxx.
## 2.13.1 2016-09-23
diff --git a/app/images/icon-32.png b/app/images/icon-32.png
new file mode 100644
index 000000000..f801ebb6b
--- /dev/null
+++ b/app/images/icon-32.png
Binary files differ
diff --git a/app/images/icon-64.png b/app/images/icon-64.png
new file mode 100644
index 000000000..b3019ad65
--- /dev/null
+++ b/app/images/icon-64.png
Binary files differ
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 () {}
diff --git a/development/announcer.js b/development/announcer.js
new file mode 100644
index 000000000..8939244d3
--- /dev/null
+++ b/development/announcer.js
@@ -0,0 +1,12 @@
+var manifest = require('../app/manifest.json')
+var version = manifest.version
+
+var fs = require('fs')
+var path = require('path')
+var changelog = fs.readFileSync(path.join(__dirname, '..', 'CHANGELOG.md')).toString()
+
+var log = changelog.split(version)[1].split('##')[0].trim()
+
+let msg = `**MetaMask ${version}** now published to the Chrome Store! It should be available over the next hour!\n${log}`
+
+console.log(msg)
diff --git a/package.json b/package.json
index 1eef432e0..72c682173 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
"mock": "beefy mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
"buildMock": "browserify ./mock-dev.js -o ./development/bundle.js",
"testem": "npm run buildMock && testem",
- "ci": "npm run buildMock && testem ci -P 2"
+ "ci": "npm run buildMock && testem ci -P 2",
+ "announce": "node development/announcer.js"
},
"browserify": {
"transform": [
@@ -81,7 +82,7 @@
"through2": "^2.0.1",
"vreme": "^3.0.2",
"web3": "ethereum/web3.js#260ac6e78a8ce4b2e13f5bb0fdb65f4088585876",
- "web3-provider-engine": "^8.0.7",
+ "web3-provider-engine": "^8.1.0",
"web3-stream-provider": "^2.0.6",
"xtend": "^4.0.1"
},
diff --git a/ui/app/components/account-export.js b/ui/app/components/account-export.js
index f36b9faeb..6d8b099a5 100644
--- a/ui/app/components/account-export.js
+++ b/ui/app/components/account-export.js
@@ -3,6 +3,7 @@ const h = require('react-hyperscript')
const inherits = require('util').inherits
const copyToClipboard = require('copy-to-clipboard')
const actions = require('../actions')
+const ethUtil = require('ethereumjs-util')
module.exports = ExportAccountView
@@ -61,7 +62,9 @@ ExportAccountView.prototype.render = function () {
if (accountExported) {
return h('div.privateKey', {
-
+ style: {
+ margin: '0 20px',
+ },
}, [
h('label', 'Your private key (click to copy):'),
h('p.error.cursor-pointer', {
@@ -72,9 +75,9 @@ ExportAccountView.prototype.render = function () {
width: '100%',
},
onClick: function (event) {
- copyToClipboard(accountDetail.privateKey)
+ copyToClipboard(ethUtil.stripHexPrefix(accountDetail.privateKey))
},
- }, accountDetail.privateKey),
+ }, ethUtil.stripHexPrefix(accountDetail.privateKey)),
h('button', {
onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)),
}, 'Done'),
diff --git a/ui/app/first-time/create-vault-complete.js b/ui/app/first-time/create-vault-complete.js
index 0ca0a1b22..2b5413955 100644
--- a/ui/app/first-time/create-vault-complete.js
+++ b/ui/app/first-time/create-vault-complete.js
@@ -61,6 +61,7 @@ CreateVaultCompleteScreen.prototype.render = function () {
onClick: () => this.confirmSeedWords(),
style: {
margin: '24px',
+ fontSize: '0.9em',
},
}, 'I\'ve copied it somewhere safe'),
])