diff --git a/src/app/ui/txLogger.js b/src/app/ui/txLogger.js index 0fe4b6246e..56eafb989a 100644 --- a/src/app/ui/txLogger.js +++ b/src/app/ui/txLogger.js @@ -164,7 +164,7 @@ class TxLogger { } }) - blockchain.event.register('newTransaction', (tx, receipt) => { + this.txListener.event.register('newTransaction', (tx, receipt) => { log(this, tx, receipt) }) diff --git a/src/blockchain/blockchain.js b/src/blockchain/blockchain.js index 4d68ae9c75..537dc30541 100644 --- a/src/blockchain/blockchain.js +++ b/src/blockchain/blockchain.js @@ -266,10 +266,7 @@ class Blockchain { } startListening (txlistener) { - txlistener.event.register('newTransaction', (tx, receipt) => { - this.event.emit('newTransaction', tx, receipt) - this.udapp.events.emit('newTransaction', tx, receipt) // for plugin backwards compatibility - }) + this.udapp.startListening(txlistener) } runOrCallContractMethod (contractName, contractAbi, funABI, value, address, callType, lookupOnly, logMsg, logCallback, outputCb, confirmationCb, continueCb, promptCb) { diff --git a/src/blockchain/universalDapp.js b/src/blockchain/universalDapp.js index ea28834529..370dedbb54 100644 --- a/src/blockchain/universalDapp.js +++ b/src/blockchain/universalDapp.js @@ -33,6 +33,14 @@ class UniversalDApp { this.executionContext.event.register('contextChanged', this.resetEnvironment.bind(this)) } + // TODO : event should be triggered by Udapp instead of TxListener + /** Listen on New Transaction. (Cannot be done inside constructor because txlistener doesn't exist yet) */ + startListening (txlistener) { + txlistener.event.register('newTransaction', (tx) => { + this.events.emit('newTransaction', tx) + }) + } + resetEnvironment () { this.accounts = {} if (this.executionContext.isVM()) {