diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-04-18 04:36:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-18 04:36:21 +0800 |
| commit | 6ee57dcad70057b1f71b9abe53d9d4965cbbe3e8 (patch) | |
| tree | 096c6a8f7e12c5ece8bb64af1466bb2d94b6e5d3 /old-ui/app/conf-tx.js | |
| parent | f15b81089e86dc095983faeba4a97209ddd670ce (diff) | |
| parent | 7b70804aa0d74120098a4bcb2c375d29080e8368 (diff) | |
| download | tangerine-wallet-browser-6ee57dcad70057b1f71b9abe53d9d4965cbbe3e8.tar tangerine-wallet-browser-6ee57dcad70057b1f71b9abe53d9d4965cbbe3e8.tar.gz tangerine-wallet-browser-6ee57dcad70057b1f71b9abe53d9d4965cbbe3e8.tar.bz2 tangerine-wallet-browser-6ee57dcad70057b1f71b9abe53d9d4965cbbe3e8.tar.lz tangerine-wallet-browser-6ee57dcad70057b1f71b9abe53d9d4965cbbe3e8.tar.xz tangerine-wallet-browser-6ee57dcad70057b1f71b9abe53d9d4965cbbe3e8.tar.zst tangerine-wallet-browser-6ee57dcad70057b1f71b9abe53d9d4965cbbe3e8.zip | |
Merge branch 'master' into i3580-InternationalizeCurrency
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 }) |