diff options
author | Thomas <tmashuang@gmail.com> | 2018-04-24 02:22:24 +0800 |
---|---|---|
committer | Thomas <tmashuang@gmail.com> | 2018-04-24 02:22:24 +0800 |
commit | 010092312998e90688e1bfb004eb55c67a337429 (patch) | |
tree | 93a174b2eb7074283d6e43bcc98bc1f2c7925d57 /old-ui/app/conf-tx.js | |
parent | ddece0cc11215b323df96287f39e6758aa559f77 (diff) | |
parent | 74c419f9b65841c2966d1fe3b7414bf11e09e0d8 (diff) | |
download | tangerine-wallet-browser-010092312998e90688e1bfb004eb55c67a337429.tar.gz tangerine-wallet-browser-010092312998e90688e1bfb004eb55c67a337429.tar.zst tangerine-wallet-browser-010092312998e90688e1bfb004eb55c67a337429.zip |
Merge branch 'master' into testing
Diffstat (limited to 'old-ui/app/conf-tx.js')
-rw-r--r-- | old-ui/app/conf-tx.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/old-ui/app/conf-tx.js b/old-ui/app/conf-tx.js index 1bb8eb97c..dc1dc0538 100644 --- a/old-ui/app/conf-tx.js +++ b/old-ui/app/conf-tx.js @@ -6,7 +6,9 @@ const actions = require('../../ui/app/actions') const NetworkIndicator = require('./components/network') const LoadingIndicator = require('./components/loading') const txHelper = require('../lib/tx-helper') -const isPopupOrNotification = require('../../app/scripts/lib/is-popup-or-notification') +const log = require('loglevel') +const { ENVIRONMENT_TYPE_NOTIFICATION } = require('../../app/scripts/lib/enums') +const { getEnvironmentType } = require('../../app/scripts/lib/util') const PendingTx = require('./components/pending-tx') const PendingMsg = require('./components/pending-msg') @@ -50,7 +52,7 @@ ConfirmTxScreen.prototype.render = function () { var txData = unconfTxList[props.index] || {} var txParams = txData.params || {} - var isNotification = isPopupOrNotification() === 'notification' + var isNotification = getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_NOTIFICATION log.info(`rendering a combined ${unconfTxList.length} unconf msg & txs`) if (unconfTxList.length === 0) return h(Loading, { isLoading: true }) |