aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-08-09 10:00:17 +0800
committerGitHub <noreply@github.com>2017-08-09 10:00:17 +0800
commitd40bd9a726b7bef900d36ed195e38e8537cc791d (patch)
tree4d64aa3605e5601bf6a4ff1856fa23ac42afb377 /app/scripts/controllers
parent02a6cd255ba1d081bf2a37a9df05536eb169ca34 (diff)
parent9c9165e930684b53d525d6bced6df1a76030253b (diff)
downloadtangerine-wallet-browser-d40bd9a726b7bef900d36ed195e38e8537cc791d.tar
tangerine-wallet-browser-d40bd9a726b7bef900d36ed195e38e8537cc791d.tar.gz
tangerine-wallet-browser-d40bd9a726b7bef900d36ed195e38e8537cc791d.tar.bz2
tangerine-wallet-browser-d40bd9a726b7bef900d36ed195e38e8537cc791d.tar.lz
tangerine-wallet-browser-d40bd9a726b7bef900d36ed195e38e8537cc791d.tar.xz
tangerine-wallet-browser-d40bd9a726b7bef900d36ed195e38e8537cc791d.tar.zst
tangerine-wallet-browser-d40bd9a726b7bef900d36ed195e38e8537cc791d.zip
Merge pull request #1880 from MetaMask/pendingFix
fix getPendingTransactions function for pendingTxTracker
Diffstat (limited to 'app/scripts/controllers')
-rw-r--r--app/scripts/controllers/transactions.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 664dbff6b..28130c164 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -46,10 +46,11 @@ module.exports = class TransactionController extends EventEmitter {
return account.balance
},
publishTransaction: this.txProviderUtil.publishTransaction.bind(this.txProviderUtil),
- getPendingTransactions: (address) => {
+ getPendingTransactions: () => {
+ const network = this.getNetwork()
return this.getFilteredTxList({
- from: address,
status: 'submitted',
+ metamaskNetworkId: network,
})
},
})