aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/transactions/index.js
diff options
context:
space:
mode:
Diffstat (limited to 'app/scripts/controllers/transactions/index.js')
-rw-r--r--app/scripts/controllers/transactions/index.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 9f2290924..9cf822d34 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -82,7 +82,12 @@ class TransactionController extends EventEmitter {
provider: this.provider,
nonceTracker: this.nonceTracker,
publishTransaction: (rawTx) => this.query.sendRawTransaction(rawTx),
- getPendingTransactions: this.txStateManager.getPendingTransactions.bind(this.txStateManager),
+ getPendingTransactions: () => {
+ const pending = this.txStateManager.getPendingTransactions()
+ const approved = this.txStateManager.getApprovedTransactions()
+ return [...pending, ...approved]
+ },
+ approveTransaction: this.approveTransaction.bind(this),
getCompletedTransactions: this.txStateManager.getConfirmedTransactions.bind(this.txStateManager),
})