aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md2
-rw-r--r--ui/app/account-detail.js2
-rw-r--r--ui/app/components/transaction-list-item-icon.js2
-rw-r--r--ui/app/components/transaction-list-item.js2
-rw-r--r--ui/app/css/index.css5
-rw-r--r--ui/app/first-time/disclaimer.js2
6 files changed, 11 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 113bf1ab7..2ee7dc930 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
- 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.
+- Fix formatting on terms & conditions page.
## 2.4.4 2016-06-23
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 695a1a3f9..7daa3a4dd 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -145,7 +145,7 @@ AccountDetailScreen.prototype.render = function () {
style: {
margin: 10,
},
- }, 'SEND ETH'),
+ }, 'SEND'),
]),
diff --git a/ui/app/components/transaction-list-item-icon.js b/ui/app/components/transaction-list-item-icon.js
index c640de551..8b118b1d4 100644
--- a/ui/app/components/transaction-list-item-icon.js
+++ b/ui/app/components/transaction-list-item-icon.js
@@ -15,7 +15,7 @@ TransactionIcon.prototype.render = function () {
const { transaction, txParams, isMsg } = this.props
if (transaction.status === 'rejected') {
- return h('i.fa.fa-exclamation-triangle.fa-lg.error', {
+ return h('i.fa.fa-exclamation-triangle.fa-lg.warning', {
style: {
width: '24px',
},
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index 94fde697e..82176059f 100644
--- a/ui/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
@@ -57,7 +57,7 @@ TransactionListItem.prototype.render = function () {
// large identicon
h('.identicon-wrapper.flex-column.flex-center.select-none', [
- transaction.status === 'unconfirmed' ? h('.red-dot', ' ')
+ transaction.status === 'unconfirmed' ? h('i.fa.fa-ellipsis-h', {style: { fontSize: '27px' }})
: h(TransactionIcon, { txParams, transaction, isTx, isMsg }),
]),
diff --git a/ui/app/css/index.css b/ui/app/css/index.css
index 24497a66f..d46c859ad 100644
--- a/ui/app/css/index.css
+++ b/ui/app/css/index.css
@@ -171,6 +171,11 @@ app sections
.error {
color: #E20202;
}
+
+.warning {
+ color: #FFAE00;
+}
+
.lock {
width: 50px;
height: 50px;
diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js
index bfd6c490d..7f615cfb0 100644
--- a/ui/app/first-time/disclaimer.js
+++ b/ui/app/first-time/disclaimer.js
@@ -38,7 +38,7 @@ DisclaimerScreen.prototype.render = function () {
style: {
whiteSpace: 'pre-line',
background: 'rgb(235, 235, 235)',
- height: '336px',
+ height: '310px',
padding: '6px',
width: '80%',
overflowY: 'scroll',