diff options
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/lib/notifications.js | 4 | ||||
| -rw-r--r-- | ui/app/components/pending-tx.js | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 621d9b7ff..22405a731 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ - Added a network indicator mark in dropdown menu - Added network name next to network indicator +- Unify wording for transaction approve/reject options on notifications and the extension. + +## 2.4.5 2016-06-29 + - Fixed bug where MetaMask interfered with PDF loading. - Moved switch account icon into menu bar. - Changed status shapes to be a yellow warning sign for failure and ellipsis for pending transactions. diff --git a/app/manifest.json b/app/manifest.json index d724c8001..dbf5e05f5 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "Metamask", - "version": "2.4.4", + "version": "2.4.5", "manifest_version": 2, "description": "__MSG_appDescription__", "icons": { diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js index 3d1177735..b9d7b79da 100644 --- a/app/scripts/lib/notifications.js +++ b/app/scripts/lib/notifications.js @@ -96,9 +96,9 @@ function showNotification (state) { title: state.title, message: '', buttons: [{ - title: 'confirm', + title: 'Approve', }, { - title: 'cancel', + title: 'Reject', }], }) notificationHandlers[id] = { diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js index 197e0436c..5d1fd4c16 100644 --- a/ui/app/components/pending-tx.js +++ b/ui/app/components/pending-tx.js @@ -36,14 +36,14 @@ PendingTx.prototype.render = function () { h('.flex-row.flex-space-around', [ h('button', { onClick: state.cancelTransaction, - }, 'Cancel'), + }, 'Reject'), h('button', { onClick: state.sendTransaction, - }, 'Send'), + }, 'Approve'), ]), ]) - + ) } |