poanetwork
/
nifty-wallet
mirror of https://github.com/poanetwork/nifty-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/poanetwork/metamask-extension into tests-fix

This commit is contained in:
Natalia 2018-08-02 11:05:06 -07:00
parent d87213e494 3bd448504b
commit 436ca09971
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
old-ui/app/components/copyButton.js
View File

@ -20,13 +20,14 @@ CopyButton.prototype.render = function () {
const state = this.state || {}
const value = props.value
const display = props.display
const copied = state.copied
const message = copied ? 'Copied' : props.title || ' Copy '
return h('.copy-button', {
style: {
display: 'flex',
display: display || 'flex',
alignItems: 'center',
},
}, [

12
old-ui/app/components/transaction-list-item.js
View File

@ -156,8 +156,6 @@ TransactionListItem.prototype.render = function () {
domainField(txParams),
h('div.flex-row', [
recipientField(txParams, transaction, isTx, isMsg),
// Places a copy button if tx is successful, else places a placeholder empty div.
transaction.hash ? h(CopyButton, { value: transaction.hash }) : h('div', {style: { display: 'flex', alignItems: 'center', width: '26px' }}),
]),
h('div', {
style: {
@ -253,6 +251,8 @@ function recipientField (txParams, transaction, isTx, isMsg) {
},
}, [
message,
// Places a copy button if tx is successful, else places a placeholder empty div.
transaction.hash ? h(CopyButton, { value: transaction.hash, display: 'inline-flex' }) : h('div', {style: { display: 'flex', alignItems: 'center', width: '26px' }}),
renderErrorOrWarning(transaction),
])
}
@ -266,12 +266,12 @@ function renderErrorOrWarning (transaction) {
// show dropped
if (status === 'dropped') {
return h('span.dropped', ' (Dropped)')
return h('div.dropped', ' (Dropped)')
}
// show rejected
if (status === 'rejected') {
return h('span.error', ' (Rejected)')
return h('div.error', ' (Rejected)')
}
// show error
@ -282,7 +282,7 @@ function renderErrorOrWarning (transaction) {
title: message,
position: 'bottom',
}, [
h(`span.error`, ` (Failed)`),
h(`div.error`, ` (Failed)`),
])
)
}
@ -294,7 +294,7 @@ function renderErrorOrWarning (transaction) {
title: message,
position: 'bottom',
}, [
h(`span.warning`, ` (Warning)`),
h(`div.warning`, ` (Warning)`),
])
}
}