aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorDan Finlay <542863+danfinlay@users.noreply.github.com>2017-12-07 16:44:56 +0800
committerGitHub <noreply@github.com>2017-12-07 16:44:56 +0800
commita2057a8d295f0c21bf3d459eaba6d205271c1753 (patch)
tree185c3e82c54bc5ba9be9a88b10337f71a5add8b1 /app/scripts/metamask-controller.js
parenta78cc013d199547ba865a0d1c2fec9a328ce7e0b (diff)
parent706a07d0e9f3a7cc443ba6b797bf548e19065496 (diff)
downloadtangerine-wallet-browser-a2057a8d295f0c21bf3d459eaba6d205271c1753.tar
tangerine-wallet-browser-a2057a8d295f0c21bf3d459eaba6d205271c1753.tar.gz
tangerine-wallet-browser-a2057a8d295f0c21bf3d459eaba6d205271c1753.tar.bz2
tangerine-wallet-browser-a2057a8d295f0c21bf3d459eaba6d205271c1753.tar.lz
tangerine-wallet-browser-a2057a8d295f0c21bf3d459eaba6d205271c1753.tar.xz
tangerine-wallet-browser-a2057a8d295f0c21bf3d459eaba6d205271c1753.tar.zst
tangerine-wallet-browser-a2057a8d295f0c21bf3d459eaba6d205271c1753.zip
Merge pull request #2684 from MetaMask/RetryTransaction
Retry transaction
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js9
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)