Merge branch 'master' into CopyTxHash

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Current Master
 
 - Add copy transaction hash button to completed transaction list items.
+- Unify wording for transaction approve/reject options on notifications and the extension.
 
 ## 2.4.5 2016-06-29
 

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] = {

ui/app/components/pending-tx.js

@@ -36,10 +36,10 @@ PendingTx.prototype.render = function () {
       h('.flex-row.flex-space-around', [
         h('button', {
           onClick: state.cancelTransaction,
-        }, 'Cancel'),
+        }, 'Reject'),
         h('button', {
           onClick: state.sendTransaction,
-        }, 'Send'),
+        }, 'Approve'),
       ]),
 
     ])