aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/conf-tx.js
diff options
context:
space:
mode:
authorDan Finlay <flyswatter@users.noreply.github.com>2017-01-06 07:37:16 +0800
committerGitHub <noreply@github.com>2017-01-06 07:37:16 +0800
commit98ebdeeeacc973a98fd07ead204cf4d84eb3adee (patch)
treee1cdd6bf33af4da4d3a21de0018d51b33976c43c /ui/app/conf-tx.js
parent906c3882bb426985b403e744727f3a2071eabce7 (diff)
parent4e62ae98bd7c62ef0618c4c5e88569b86d1bffec (diff)
downloadtangerine-wallet-browser-98ebdeeeacc973a98fd07ead204cf4d84eb3adee.tar.gz
tangerine-wallet-browser-98ebdeeeacc973a98fd07ead204cf4d84eb3adee.tar.zst
tangerine-wallet-browser-98ebdeeeacc973a98fd07ead204cf4d84eb3adee.zip
Merge pull request #970 from MetaMask/network-indicator-refactor
Network indicator modifications
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r--ui/app/conf-tx.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 0b1dcac45..52b7a7ae4 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -4,6 +4,7 @@ const ReactCSSTransitionGroup = require('react-addons-css-transition-group')
const h = require('react-hyperscript')
const connect = require('react-redux').connect
const actions = require('./actions')
+const NetworkIndicator = require('./components/network')
const txHelper = require('../lib/tx-helper')
const isPopupOrNotification = require('../../app/scripts/lib/is-popup-or-notification')
const ethUtil = require('ethereumjs-util')
@@ -24,6 +25,7 @@ function mapStateToProps (state) {
index: state.appState.currentView.context,
warning: state.appState.warning,
network: state.metamask.network,
+ provider: state.metamask.provider,
}
}
@@ -36,6 +38,7 @@ ConfirmTxScreen.prototype.render = function () {
var state = this.props
var network = state.network
+ var provider = state.provider
var unconfTxs = state.unconfTxs
var unconfMsgs = state.unconfMsgs
var unconfTxList = txHelper(unconfTxs, unconfMsgs, network)
@@ -54,6 +57,10 @@ ConfirmTxScreen.prototype.render = function () {
onClick: this.goHome.bind(this),
}) : null,
h('h2.page-subtitle', 'Confirm Transaction'),
+ isNotification ? h(NetworkIndicator, {
+ network: network,
+ provider: provider,
+ }) : null,
]),
h('h3', {