diff options
| author | Thomas <thomas.b.huang@gmail.com> | 2018-05-17 13:44:51 +0800 |
|---|---|---|
| committer | Thomas <thomas.b.huang@gmail.com> | 2018-05-17 13:44:51 +0800 |
| commit | d9be7f989a86e3fdfd83e4c632fd08cefd8309e5 (patch) | |
| tree | bbfeb7098997244ce7e8ce28e896faa2dfb6bb6e /ui/app/unlock.js | |
| parent | 06e25205b200b976e286c670cc5e703439dab05c (diff) | |
| parent | f441153211c7920573f8bfb699bfda1b6de7efe9 (diff) | |
| download | tangerine-wallet-browser-d9be7f989a86e3fdfd83e4c632fd08cefd8309e5.tar.gz tangerine-wallet-browser-d9be7f989a86e3fdfd83e4c632fd08cefd8309e5.tar.zst tangerine-wallet-browser-d9be7f989a86e3fdfd83e4c632fd08cefd8309e5.zip | |
Merge branch 'testing' of https://github.com/tmashuang/metamask-extension into testing
Diffstat (limited to 'ui/app/unlock.js')
| -rw-r--r-- | ui/app/unlock.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/app/unlock.js b/ui/app/unlock.js index 84d8b7e7c..099e5f9c6 100644 --- a/ui/app/unlock.js +++ b/ui/app/unlock.js @@ -6,8 +6,9 @@ const connect = require('react-redux').connect const actions = require('./actions') const getCaretCoordinates = require('textarea-caret') const EventEmitter = require('events').EventEmitter -const { OLD_UI_NETWORK_TYPE } = require('../../app/scripts/config').enums -const environmentType = require('../../app/scripts/lib/environment-type') +const { OLD_UI_NETWORK_TYPE } = require('../../app/scripts/controllers/network/enums') +const { getEnvironmentType } = require('../../app/scripts/lib/util') +const { ENVIRONMENT_TYPE_POPUP } = require('../../app/scripts/lib/enums') const Mascot = require('./components/mascot') @@ -77,7 +78,7 @@ UnlockScreen.prototype.render = function () { h('p.pointer', { onClick: () => { this.props.dispatch(actions.markPasswordForgotten()) - if (environmentType() === 'popup') { + if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP) { global.platform.openExtensionInBrowser() } }, |