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

background - txManager - filter txs by network

This commit is contained in:
kumavis 2017-01-14 21:29:46 -08:00
parent c3d491a37c
commit f49fb149cc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/scripts/background.js
View File

@ -22,7 +22,7 @@ const controller = new MetamaskController({
setData, setData,
loadData, loadData,
}) })
const txManager = controller.txManager
function triggerUi () { function triggerUi () {
if (!popupIsOpen) notification.show() if (!popupIsOpen) notification.show()
} }
@ -93,7 +93,8 @@ function setupControllerConnection (stream) {
// plugin badge text // plugin badge text
// //
txManager.on('updateBadge', updateBadge) controller.txManager.on('updateBadge', updateBadge)
updateBadge()
function updateBadge () { function updateBadge () {
var label = '' var label = ''

5
app/scripts/transaction-manager.js
View File

@ -35,7 +35,8 @@ module.exports = class TransactionManager extends EventEmitter {
// Returns the tx list // Returns the tx list
getTxList () { getTxList () {
return this.txList let network = this.getNetwork()
return this.txList.filter(txMeta => txMeta.metamaskNetworkId === network)
} }
// Adds a tx to the txlist // Adds a tx to the txlist
@ -345,8 +346,8 @@ module.exports = class TransactionManager extends EventEmitter {
if (status === 'submitted' || status === 'rejected') { if (status === 'submitted' || status === 'rejected') {
this.emit(`${txMeta.id}:finished`, status) this.emit(`${txMeta.id}:finished`, status)
} }
this.emit('updateBadge')
this.updateTx(txMeta) this.updateTx(txMeta)
this.emit('updateBadge')
} }
// Saves the new/updated txList. // Saves the new/updated txList.