From 3ae479f5ac3a569eb3840f119148bc4db626a295 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Wed, 29 Jun 2016 15:44:37 -0700 Subject: Unify wording for transaction options (#369) * Unify wording for transaction options. * Modify changelog. * Fix wording and spacing. --- CHANGELOG.md | 2 ++ app/scripts/lib/notifications.js | 4 ++-- ui/app/components/pending-tx.js | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ffec75cb..62b59b810 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +- 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. 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'), ]), ]) - + ) } -- cgit v1.2.3