diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-12-21 09:38:28 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-21 09:38:28 +0800 |
| commit | 9959aea5987a123209c962632d54e503f1d458a5 (patch) | |
| tree | cdb705c11731a59d59b8015918b260a07f159f8b /app/scripts | |
| parent | 7915e62d65de1bbc3419cba58f69e6d55a4df3ea (diff) | |
| parent | e7e1b7a95180597308bd167bd4a152bbbf53ff21 (diff) | |
| download | tangerine-wallet-browser-9959aea5987a123209c962632d54e503f1d458a5.tar tangerine-wallet-browser-9959aea5987a123209c962632d54e503f1d458a5.tar.gz tangerine-wallet-browser-9959aea5987a123209c962632d54e503f1d458a5.tar.bz2 tangerine-wallet-browser-9959aea5987a123209c962632d54e503f1d458a5.tar.lz tangerine-wallet-browser-9959aea5987a123209c962632d54e503f1d458a5.tar.xz tangerine-wallet-browser-9959aea5987a123209c962632d54e503f1d458a5.tar.zst tangerine-wallet-browser-9959aea5987a123209c962632d54e503f1d458a5.zip | |
Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20
Diffstat (limited to 'app/scripts')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 4 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index f95b5e39a..8a193849a 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -194,6 +194,10 @@ module.exports = class TransactionController extends EventEmitter { this.txStateManager.updateTx(txMeta, 'retryTransaction: manual retry') } + async updateTransaction (txMeta) { + this.txStateManager.updateTx(txMeta, 'confTx: user updated transaction') + } + async updateAndApproveTransaction (txMeta) { this.txStateManager.updateTx(txMeta, 'confTx: user approved transaction') await this.approveTransaction(txMeta.id) diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 54e73d180..e2a911598 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -376,6 +376,7 @@ module.exports = class MetamaskController extends EventEmitter { // txController cancelTransaction: nodeify(txController.cancelTransaction, txController), + updateTransaction: nodeify(txController.updateTransaction, txController), updateAndApproveTransaction: nodeify(txController.updateAndApproveTransaction, txController), retryTransaction: nodeify(this.retryTransaction, this), |