aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers
diff options
context:
space:
mode:
authorChi Kei Chan <chikeichan@gmail.com>2017-12-21 09:38:28 +0800
committerGitHub <noreply@github.com>2017-12-21 09:38:28 +0800
commit9959aea5987a123209c962632d54e503f1d458a5 (patch)
treecdb705c11731a59d59b8015918b260a07f159f8b /app/scripts/controllers
parent7915e62d65de1bbc3419cba58f69e6d55a4df3ea (diff)
parente7e1b7a95180597308bd167bd4a152bbbf53ff21 (diff)
downloadtangerine-wallet-browser-9959aea5987a123209c962632d54e503f1d458a5.tar.gz
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/controllers')
-rw-r--r--app/scripts/controllers/transactions.js4
1 files changed, 4 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)