diff options
author | Alexander Tseung <alextsg@gmail.com> | 2018-01-17 10:17:28 +0800 |
---|---|---|
committer | Alexander Tseung <alextsg@gmail.com> | 2018-01-17 10:17:28 +0800 |
commit | 81f86cfab6da37f1a87f3243c6a082f8835ab81b (patch) | |
tree | 6af56231142544c5983bbe24d74644011596d003 /app/scripts/controllers/transactions.js | |
parent | aa76c5c73c5a9f0507ef69d88a43cf3bee5d60c0 (diff) | |
parent | 77eb7b2db692cc40bf5f8e36c5e695e8f82c76ec (diff) | |
download | tangerine-wallet-browser-81f86cfab6da37f1a87f3243c6a082f8835ab81b.tar tangerine-wallet-browser-81f86cfab6da37f1a87f3243c6a082f8835ab81b.tar.gz tangerine-wallet-browser-81f86cfab6da37f1a87f3243c6a082f8835ab81b.tar.bz2 tangerine-wallet-browser-81f86cfab6da37f1a87f3243c6a082f8835ab81b.tar.lz tangerine-wallet-browser-81f86cfab6da37f1a87f3243c6a082f8835ab81b.tar.xz tangerine-wallet-browser-81f86cfab6da37f1a87f3243c6a082f8835ab81b.tar.zst tangerine-wallet-browser-81f86cfab6da37f1a87f3243c6a082f8835ab81b.zip |
Merge branch 'uat' into uat-master-011618
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 bb9253175..290444bbb 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -201,6 +201,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) |