diff options
author | Dan Finlay <dan@danfinlay.com> | 2017-12-08 05:05:17 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2017-12-08 05:05:17 +0800 |
commit | 89e640afcbd50307fcdae13f961f4b3cf6164b5b (patch) | |
tree | 44d553c3f4865cb23d11a654700a3967edce165b /app/scripts/metamask-controller.js | |
parent | 553d713636d317b74d819d62b5b931bdf2d112d8 (diff) | |
parent | 35be563fbdc74974f54b3e90b2eba319b0619754 (diff) | |
download | tangerine-wallet-browser-89e640afcbd50307fcdae13f961f4b3cf6164b5b.tar.gz tangerine-wallet-browser-89e640afcbd50307fcdae13f961f4b3cf6164b5b.tar.zst tangerine-wallet-browser-89e640afcbd50307fcdae13f961f4b3cf6164b5b.zip |
Merge branch 'master' into patch-2
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r-- | app/scripts/metamask-controller.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 130ad1471..9d126b416 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -363,6 +363,7 @@ module.exports = class MetamaskController extends EventEmitter { // txController cancelTransaction: nodeify(txController.cancelTransaction, txController), updateAndApproveTransaction: nodeify(txController.updateAndApproveTransaction, txController), + retryTransaction: nodeify(this.retryTransaction, this), // messageManager signMessage: nodeify(this.signMessage, this), @@ -573,6 +574,14 @@ module.exports = class MetamaskController extends EventEmitter { // // Identity Management // + // + + async retryTransaction (txId, cb) { + await this.txController.retryTransaction(txId) + const state = await this.getState() + return state + } + newUnsignedMessage (msgParams, cb) { const msgId = this.messageManager.addUnapprovedMessage(msgParams) |