diff options
author | kumavis <aaron@kumavis.me> | 2016-09-13 06:25:36 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2016-09-13 06:25:36 +0800 |
commit | 850b6d144092291bb80ad998d3f8177da9c98c13 (patch) | |
tree | 94666fa470c77971c56217e762fece18bf2e3edf /ui/app/conf-tx.js | |
parent | 2f289fb115f0b09ab7852b4c89b3c39c5bf6ec4e (diff) | |
parent | b8f75e387a91135b870c9f268977445c8e0877a4 (diff) | |
download | tangerine-wallet-browser-850b6d144092291bb80ad998d3f8177da9c98c13.tar.gz tangerine-wallet-browser-850b6d144092291bb80ad998d3f8177da9c98c13.tar.zst tangerine-wallet-browser-850b6d144092291bb80ad998d3f8177da9c98c13.zip |
Merge branch 'master' of github.com:MetaMask/metamask-plugin into library
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r-- | ui/app/conf-tx.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index 43604e8cf..99b4bc9f1 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -5,6 +5,7 @@ const h = require('react-hyperscript') const connect = require('react-redux').connect const actions = require('./actions') const txHelper = require('../lib/tx-helper') +const isPopupOrNotification = require('../../app/scripts/lib/is-popup-or-notification') const PendingTx = require('./components/pending-tx') const PendingMsg = require('./components/pending-msg') @@ -20,6 +21,7 @@ function mapStateToProps (state) { unconfMsgs: state.metamask.unconfMsgs, index: state.appState.currentView.context, warning: state.appState.warning, + network: state.metamask.network, } } @@ -31,11 +33,13 @@ 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' return ( @@ -43,9 +47,9 @@ ConfirmTxScreen.prototype.render = function () { // subtitle and nav h('.section-title.flex-row.flex-center', [ - h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { + !isNotification ? h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { onClick: this.goHome.bind(this), - }), + }) : null, h('h2.page-subtitle', 'Confirm Transaction'), ]), |