aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/conf-tx.js
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-09-09 03:56:04 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-09-09 03:56:04 +0800
commit6f86c5f8ee6779eddfde1fbc32e356bbc80708f3 (patch)
tree3458a0b05c8e0664ae6d853b47a385225ea722d2 /ui/app/conf-tx.js
parent5f8d3085d7603135849eb22ad22c70733c236c2d (diff)
downloadtangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar.gz
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar.bz2
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar.lz
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar.xz
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar.zst
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.zip
Add network checks for unconfirmed Txs
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'