aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/conf-tx.js
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-09-09 06:39:42 +0800
committerGitHub <noreply@github.com>2016-09-09 06:39:42 +0800
commitfc0f64a5a8cf23c0feed2e2583cf07de7c9548a5 (patch)
tree712c02bfc76bfa8136e123d6ab7ceae85a50a6ba /ui/app/conf-tx.js
parent1f0b2ca787670455a2cbecf9d539a7fb66793525 (diff)
parent3f64095eed151dbef9e18d388c8f30d43f18bbae (diff)
downloadtangerine-wallet-browser-fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5.tar
tangerine-wallet-browser-fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5.tar.gz
tangerine-wallet-browser-fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5.tar.bz2
tangerine-wallet-browser-fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5.tar.lz
tangerine-wallet-browser-fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5.tar.xz
tangerine-wallet-browser-fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5.tar.zst
tangerine-wallet-browser-fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5.zip
Merge pull request #627 from MetaMask/i#589pendingTxsIssue
I#589pending txs issue
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r--ui/app/conf-tx.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 22d29383f..99b4bc9f1 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -21,6 +21,7 @@ function mapStateToProps (state) {
unconfMsgs: state.metamask.unconfMsgs,
index: state.appState.currentView.context,
warning: state.appState.warning,
+ network: state.metamask.network,
}
}
@@ -32,9 +33,10 @@ function ConfirmTxScreen () {
ConfirmTxScreen.prototype.render = function () {
var state = this.props
+ var network = state.network
var unconfTxs = state.unconfTxs
var unconfMsgs = state.unconfMsgs
- var unconfTxList = txHelper(unconfTxs, unconfMsgs)
+ var unconfTxList = txHelper(unconfTxs, unconfMsgs, network)
var index = state.index !== undefined ? state.index : 0
var txData = unconfTxList[index] || unconfTxList[0] || {}
var isNotification = isPopupOrNotification() === 'notification'