diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-02-22 07:46:31 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 07:46:31 +0800 |
| commit | eed75735b8e90d121537249cf147c1ece60f1e47 (patch) | |
| tree | c7cfc9bea782df7035761caa8c1809d8fde58824 /app/scripts/controllers/transactions.js | |
| parent | 16754fa30744df8b3b3edc0e5229db29f3ad23ec (diff) | |
| parent | e27a3823ba2595baa7c3378e6a6f2aa5dae30250 (diff) | |
| download | tangerine-wallet-browser-eed75735b8e90d121537249cf147c1ece60f1e47.tar tangerine-wallet-browser-eed75735b8e90d121537249cf147c1ece60f1e47.tar.gz tangerine-wallet-browser-eed75735b8e90d121537249cf147c1ece60f1e47.tar.bz2 tangerine-wallet-browser-eed75735b8e90d121537249cf147c1ece60f1e47.tar.lz tangerine-wallet-browser-eed75735b8e90d121537249cf147c1ece60f1e47.tar.xz tangerine-wallet-browser-eed75735b8e90d121537249cf147c1ece60f1e47.tar.zst tangerine-wallet-browser-eed75735b8e90d121537249cf147c1ece60f1e47.zip | |
Merge pull request #3050 from MetaMask/uat
[EPIC] Merge UAT into master
Diffstat (limited to 'app/scripts/controllers/transactions.js')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index a3670155a..ef5578d5a 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -233,6 +233,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) |