aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Finlay <flyswatter@users.noreply.github.com>2017-01-03 06:04:27 +0800
committerGitHub <noreply@github.com>2017-01-03 06:04:27 +0800
commit25d0ac147668e45da43a4dd74876e3e22bd6a246 (patch)
tree6a81531e5398afc26685e7b0523c7526dabd0f7f /ui
parentedc5f9e821bf18fa6ec984e645790fba3457d0bb (diff)
parentfb002dc44eae82e0471b8b52acecc61ba5f39332 (diff)
downloadtangerine-wallet-browser-25d0ac147668e45da43a4dd74876e3e22bd6a246.tar
tangerine-wallet-browser-25d0ac147668e45da43a4dd74876e3e22bd6a246.tar.gz
tangerine-wallet-browser-25d0ac147668e45da43a4dd74876e3e22bd6a246.tar.bz2
tangerine-wallet-browser-25d0ac147668e45da43a4dd74876e3e22bd6a246.tar.lz
tangerine-wallet-browser-25d0ac147668e45da43a4dd74876e3e22bd6a246.tar.xz
tangerine-wallet-browser-25d0ac147668e45da43a4dd74876e3e22bd6a246.tar.zst
tangerine-wallet-browser-25d0ac147668e45da43a4dd74876e3e22bd6a246.zip
Merge branch 'dev' into ShowDifferentAccounts
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/transaction-list-item.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index d1306549e..bb685abda 100644
--- a/ui/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
@@ -31,7 +31,7 @@ TransactionListItem.prototype.render = function () {
var isMsg = ('msgParams' in transaction)
var isTx = ('txParams' in transaction)
- var isPending = transaction.status === 'unconfirmed'
+ var isPending = transaction.status === 'unapproved'
let txParams
if (isTx) {
@@ -59,7 +59,7 @@ TransactionListItem.prototype.render = function () {
}, [
h('.identicon-wrapper.flex-column.flex-center.select-none', [
- transaction.status === 'unconfirmed' ? h('i.fa.fa-ellipsis-h', {
+ transaction.status === 'unapproved' ? h('i.fa.fa-ellipsis-h', {
style: {
fontSize: '27px',
},