mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Merge pull request #1468 from MetaMask/HelpDebugStalledTxs
Help debug stalled txs
This commit is contained in:
commit
650365f9f2
@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
## Current Master
|
## Current Master
|
||||||
|
|
||||||
|
- Add Transaction Number (nonce) to transaction list.
|
||||||
|
- Label the pending tx icon with a tooltip.
|
||||||
- Fix bug where website filters would pile up and not deallocate when leaving a site.
|
- Fix bug where website filters would pile up and not deallocate when leaving a site.
|
||||||
|
|
||||||
## 3.6.5 2017-5-17
|
## 3.6.5 2017-5-17
|
||||||
|
@ -87,6 +87,7 @@
|
|||||||
"mississippi": "^1.2.0",
|
"mississippi": "^1.2.0",
|
||||||
"mkdirp": "^0.5.1",
|
"mkdirp": "^0.5.1",
|
||||||
"multiplex": "^6.7.0",
|
"multiplex": "^6.7.0",
|
||||||
|
"number-to-bn": "^1.7.0",
|
||||||
"obs-store": "^2.3.1",
|
"obs-store": "^2.3.1",
|
||||||
"once": "^1.3.3",
|
"once": "^1.3.3",
|
||||||
"ping-pong-stream": "^1.0.0",
|
"ping-pong-stream": "^1.0.0",
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
const Component = require('react').Component
|
const Component = require('react').Component
|
||||||
const h = require('react-hyperscript')
|
const h = require('react-hyperscript')
|
||||||
const inherits = require('util').inherits
|
const inherits = require('util').inherits
|
||||||
|
const Tooltip = require('./tooltip')
|
||||||
|
|
||||||
const Identicon = require('./identicon')
|
const Identicon = require('./identicon')
|
||||||
|
|
||||||
@ -32,11 +33,16 @@ TransactionIcon.prototype.render = function () {
|
|||||||
})
|
})
|
||||||
|
|
||||||
case 'submitted':
|
case 'submitted':
|
||||||
return h('i.fa.fa-ellipsis-h', {
|
return h(Tooltip, {
|
||||||
style: {
|
title: 'Pending',
|
||||||
fontSize: '27px',
|
position: 'bottom',
|
||||||
},
|
}, [
|
||||||
})
|
h('i.fa.fa-ellipsis-h', {
|
||||||
|
style: {
|
||||||
|
fontSize: '27px',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isMsg) {
|
if (isMsg) {
|
||||||
|
@ -8,6 +8,7 @@ const explorerLink = require('../../lib/explorer-link')
|
|||||||
const CopyButton = require('./copyButton')
|
const CopyButton = require('./copyButton')
|
||||||
const vreme = new (require('vreme'))
|
const vreme = new (require('vreme'))
|
||||||
const Tooltip = require('./tooltip')
|
const Tooltip = require('./tooltip')
|
||||||
|
const numberToBN = require('number-to-bn')
|
||||||
|
|
||||||
const TransactionIcon = require('./transaction-list-item-icon')
|
const TransactionIcon = require('./transaction-list-item-icon')
|
||||||
const ShiftListItem = require('./shift-list-item')
|
const ShiftListItem = require('./shift-list-item')
|
||||||
@ -39,6 +40,8 @@ TransactionListItem.prototype.render = function () {
|
|||||||
txParams = transaction.msgParams
|
txParams = transaction.msgParams
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const nonce = txParams.nonce ? numberToBN(txParams.nonce).toString(10) : ''
|
||||||
|
|
||||||
const isClickable = ('hash' in transaction && isLinkable) || isPending
|
const isClickable = ('hash' in transaction && isLinkable) || isPending
|
||||||
return (
|
return (
|
||||||
h(`.transaction-list-item.flex-row.flex-space-between${isClickable ? '.pointer' : ''}`, {
|
h(`.transaction-list-item.flex-row.flex-space-between${isClickable ? '.pointer' : ''}`, {
|
||||||
@ -69,6 +72,22 @@ TransactionListItem.prototype.render = function () {
|
|||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
|
|
||||||
|
h(Tooltip, {
|
||||||
|
title: 'Transaction Number',
|
||||||
|
position: 'bottom',
|
||||||
|
}, [
|
||||||
|
h('span', {
|
||||||
|
style: {
|
||||||
|
display: 'flex',
|
||||||
|
cursor: 'normal',
|
||||||
|
flexDirection: 'column',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
padding: '10px',
|
||||||
|
},
|
||||||
|
}, nonce),
|
||||||
|
]),
|
||||||
|
|
||||||
h('.flex-column', {style: {width: '200px', overflow: 'hidden'}}, [
|
h('.flex-column', {style: {width: '200px', overflow: 'hidden'}}, [
|
||||||
domainField(txParams),
|
domainField(txParams),
|
||||||
h('div', date),
|
h('div', date),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user