aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/_locales/en/messages.json14
-rw-r--r--ui/app/components/tx-list-item.js27
2 files changed, 39 insertions, 2 deletions
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 7353d8976..c64b7248b 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -37,6 +37,9 @@
"message": "MetaMask",
"description": "The name of the application"
},
+ "approved": {
+ "message": "Approved"
+ },
"attemptingConnect": {
"message": "Attempting to connect to blockchain."
},
@@ -232,6 +235,9 @@
"downloadStatelogs": {
"message": "Download State Logs"
},
+ "dropped": {
+ "message": "Dropped"
+ },
"edit": {
"message": "Edit"
},
@@ -703,7 +709,7 @@
"message": "Settings"
},
"info": {
- "message": "Info"
+ "message": "Info"
},
"shapeshiftBuy": {
"message": "Buy with Shapeshift"
@@ -717,6 +723,9 @@
"sign": {
"message": "Sign"
},
+ "signed": {
+ "message": "Signed"
+ },
"signMessage": {
"message": "Sign Message"
},
@@ -747,6 +756,9 @@
"submit": {
"message": "Submit"
},
+ "submitted": {
+ "message": "Submitted"
+ },
"supportCenter": {
"message": "Visit our Support Center"
},
diff --git a/ui/app/components/tx-list-item.js b/ui/app/components/tx-list-item.js
index 5ff1820a6..d104eda88 100644
--- a/ui/app/components/tx-list-item.js
+++ b/ui/app/components/tx-list-item.js
@@ -265,7 +265,7 @@ TxListItem.prototype.render = function () {
'tx-list-status--dropped': transactionStatus === 'dropped',
}),
},
- transactionStatus,
+ this.txStatusIndicator(),
),
]),
]),
@@ -300,3 +300,28 @@ TxListItem.prototype.render = function () {
]), // holding on icon from design
])
}
+
+TxListItem.prototype.txStatusIndicator = function () {
+ const { transactionStatus } = this.props
+
+ let name
+
+ if (transactionStatus === 'unapproved') {
+ name = t('unapproved')
+ } else if (transactionStatus === 'rejected') {
+ name = t('rejected')
+ } else if (transactionStatus === 'approved') {
+ name = t('approved')
+ } else if (transactionStatus === 'signed') {
+ name = t('signed')
+ } else if (transactionStatus === 'submitted') {
+ name = t('submitted')
+ } else if (transactionStatus === 'confirmed') {
+ name = t('confirmed')
+ } else if (transactionStatus === 'failed') {
+ name = t('failed')
+ } else if (transactionStatus === 'dropped') {
+ name = t('dropped')
+ }
+ return name
+}