m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

fix merge and errors disaperaing on update

Browse Source
This commit is contained in:
frankiebee 2017-09-06 14:01:07 -07:00
parent 6c83ba762e
commit a73aecc796
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/controllers/transactions.js
View File

@ -56,7 +56,7 @@ module.exports = class TransactionController extends EventEmitter {
}) })
}, },
getConfirmedTransactions: (address) => { getConfirmedTransactions: (address) => {
return this.getFilteredTxList({ return this.txStateManager.getFilteredTxList({
from: address, from: address,
status: 'confirmed', status: 'confirmed',
err: undefined, err: undefined,

7
app/scripts/lib/tx-state-manager.js
View File

@ -180,9 +180,12 @@ module.exports = class TransactionStateManger extends ObservableStore {
this._setTxStatus(txId, 'confirmed') this._setTxStatus(txId, 'confirmed')
} }
setTxStatusFailed (txId, reason) { setTxStatusFailed (txId, err) {
const txMeta = this.getTx(txId) const txMeta = this.getTx(txId)
txMeta.err = reason txMeta.err = {
message: err.toString(),
stack: err.stack,
}
this.updateTx(txMeta) this.updateTx(txMeta)
this._setTxStatus(txId, 'failed') this._setTxStatus(txId, 'failed')
} }