aboutsummaryrefslogtreecommitdiffstats
path: root/ui/lib/tx-helper.js
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-02-08 10:55:26 +0800
committerGitHub <noreply@github.com>2017-02-08 10:55:26 +0800
commitc9aab2084ec7dd8b81b02c9053a8fcbb6038e0b9 (patch)
tree139d5dfad53652b50e0af07c3aec37394b3b654b /ui/lib/tx-helper.js
parentffe588365cb2dd84906613d13ad8e35b08a08dbb (diff)
parentce57957aa0fdeb79efd6ede8b6e94b8f26131dcf (diff)
downloadtangerine-wallet-browser-c9aab2084ec7dd8b81b02c9053a8fcbb6038e0b9.tar
tangerine-wallet-browser-c9aab2084ec7dd8b81b02c9053a8fcbb6038e0b9.tar.gz
tangerine-wallet-browser-c9aab2084ec7dd8b81b02c9053a8fcbb6038e0b9.tar.bz2
tangerine-wallet-browser-c9aab2084ec7dd8b81b02c9053a8fcbb6038e0b9.tar.lz
tangerine-wallet-browser-c9aab2084ec7dd8b81b02c9053a8fcbb6038e0b9.tar.xz
tangerine-wallet-browser-c9aab2084ec7dd8b81b02c9053a8fcbb6038e0b9.tar.zst
tangerine-wallet-browser-c9aab2084ec7dd8b81b02c9053a8fcbb6038e0b9.zip
Merge pull request #1094 from MetaMask/dev
Version 3.2.0
Diffstat (limited to 'ui/lib/tx-helper.js')
-rw-r--r--ui/lib/tx-helper.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/lib/tx-helper.js b/ui/lib/tx-helper.js
index c984bc9af..fa7a94cdc 100644
--- a/ui/lib/tx-helper.js
+++ b/ui/lib/tx-helper.js
@@ -1,8 +1,8 @@
const valuesFor = require('../app/util').valuesFor
-module.exports = function (unconfTxs, unconfMsgs, network) {
- var txValues = network ? valuesFor(unconfTxs).filter(tx => tx.txParams.metamaskNetworkId === network) : valuesFor(unconfTxs)
- var msgValues = valuesFor(unconfMsgs)
+module.exports = function (unapprovedTxs, unapprovedMsgs, network) {
+ var txValues = network ? valuesFor(unapprovedTxs).filter(tx => tx.txParams.metamaskNetworkId === network) : valuesFor(unapprovedTxs)
+ var msgValues = valuesFor(unapprovedMsgs)
var allValues = txValues.concat(msgValues)
return allValues.sort(tx => tx.time)
}