aboutsummaryrefslogtreecommitdiffstats
path: root/old-ui
diff options
context:
space:
mode:
authorAlexander Tseung <alextsg@gmail.com>2018-04-17 14:03:47 +0800
committerAlexander Tseung <alextsg@gmail.com>2018-04-17 23:58:37 +0800
commitb0a105ce809b8b7e5e4431bd1ddecc523586cad0 (patch)
treea1b0877175b6555dcded6bb61bc07e1ada81e12d /old-ui
parente4eb69dcc290a7e7eb27cab7ec57a8097345d81e (diff)
downloadtangerine-wallet-browser-b0a105ce809b8b7e5e4431bd1ddecc523586cad0.tar
tangerine-wallet-browser-b0a105ce809b8b7e5e4431bd1ddecc523586cad0.tar.gz
tangerine-wallet-browser-b0a105ce809b8b7e5e4431bd1ddecc523586cad0.tar.bz2
tangerine-wallet-browser-b0a105ce809b8b7e5e4431bd1ddecc523586cad0.tar.lz
tangerine-wallet-browser-b0a105ce809b8b7e5e4431bd1ddecc523586cad0.tar.xz
tangerine-wallet-browser-b0a105ce809b8b7e5e4431bd1ddecc523586cad0.tar.zst
tangerine-wallet-browser-b0a105ce809b8b7e5e4431bd1ddecc523586cad0.zip
Fix confirmation popup not always opening
Diffstat (limited to 'old-ui')
-rw-r--r--old-ui/app/conf-tx.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/old-ui/app/conf-tx.js b/old-ui/app/conf-tx.js
index 67eb31c37..dc1dc0538 100644
--- a/old-ui/app/conf-tx.js
+++ b/old-ui/app/conf-tx.js
@@ -6,8 +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')
@@ -51,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 })