Merge pull request #91 from poanetwork/confirm-tx-network-name

(Fix) Confirm tx notification popup: network name

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Current Master
 
+- [#91](https://github.com/poanetwork/metamask-extension/pull/91): (Fix) Confirm tx notification popup: network name
 - [#89](https://github.com/poanetwork/metamask-extension/pull/89): (Feature) Support of token per network basis
 - [#85](https://github.com/poanetwork/metamask-extension/pull/85): (Upgrade) node, npm packages versions
 - [#84](https://github.com/poanetwork/metamask-extension/pull/84): (Fix) Change green color

old-ui/app/components/pending-tx.js

@@ -48,6 +48,7 @@ function mapStateToProps (state) {
     warning: state.appState.warning,
     network: state.metamask.network,
     provider: state.metamask.provider,
+    isUnlocked: state.metamask.isUnlocked,
     conversionRate: state.metamask.conversionRate,
     currentCurrency: state.metamask.currentCurrency,
     blockGasLimit: state.metamask.currentBlockGasLimit,
@@ -57,7 +58,7 @@ function mapStateToProps (state) {
 
 PendingTx.prototype.render = function () {
   const props = this.props
-  const { currentCurrency, blockGasLimit, network, provider } = props
+  const { currentCurrency, blockGasLimit, network, provider, isUnlocked } = props
 
   const conversionRate = props.conversionRate
   const txMeta = this.gatherTxMeta()
@@ -272,6 +273,7 @@ PendingTx.prototype.render = function () {
               isNotification ? h(NetworkIndicator, {
                 network: network,
                 provider: provider,
+                isUnlocked: isUnlocked,
               }) : null,
             ]),