diff options
author | Dan <danjm.com@gmail.com> | 2018-04-19 02:45:48 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-04-19 02:45:48 +0800 |
commit | 649d2f8b229a6a749c0129dd5ef6dcf5b870e6c9 (patch) | |
tree | bc1e935331aa3678d18c2ffbcc04e791a711c0aa /app/scripts/ui.js | |
parent | e80bd230b9bb6ac9ff05d7095f74dd2fd7ebb3af (diff) | |
parent | 7e21fc2aa780ccb4ffb2f642156385db22c47a52 (diff) | |
download | tangerine-wallet-browser-649d2f8b229a6a749c0129dd5ef6dcf5b870e6c9.tar.gz tangerine-wallet-browser-649d2f8b229a6a749c0129dd5ef6dcf5b870e6c9.tar.zst tangerine-wallet-browser-649d2f8b229a6a749c0129dd5ef6dcf5b870e6c9.zip |
Merge branch 'master' into dm-docs-1
Diffstat (limited to 'app/scripts/ui.js')
-rw-r--r-- | app/scripts/ui.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/scripts/ui.js b/app/scripts/ui.js index 13c7ac5ec..bdab29c1e 100644 --- a/app/scripts/ui.js +++ b/app/scripts/ui.js @@ -3,12 +3,14 @@ const OldMetaMaskUiCss = require('../../old-ui/css') const NewMetaMaskUiCss = require('../../ui/css') const startPopup = require('./popup-core') const PortStream = require('./lib/port-stream.js') -const isPopupOrNotification = require('./lib/is-popup-or-notification') +const { getEnvironmentType } = require('./lib/util') +const { ENVIRONMENT_TYPE_NOTIFICATION } = require('./lib/enums') const extension = require('extensionizer') const ExtensionPlatform = require('./platforms/extension') const NotificationManager = require('./lib/notification-manager') const notificationManager = new NotificationManager() const setupRaven = require('./lib/setupRaven') +const log = require('loglevel') start().catch(log.error) @@ -26,7 +28,7 @@ async function start() { // injectCss(css) // identify window type (popup, notification) - const windowType = isPopupOrNotification() + const windowType = getEnvironmentType(window.location.href) global.METAMASK_UI_TYPE = windowType closePopupIfOpen(windowType) @@ -68,7 +70,7 @@ async function start() { function closePopupIfOpen (windowType) { - if (windowType !== 'notification') { + if (windowType !== ENVIRONMENT_TYPE_NOTIFICATION) { // should close only chrome popup notificationManager.closePopup() } |