diff options
author | Dan <danjm.com@gmail.com> | 2018-04-25 00:01:39 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-04-25 00:01:39 +0800 |
commit | 02a6d2089ede7d3faf4990c40b85b9f773f82c64 (patch) | |
tree | a46c581fae872d7ced368f067b8ae7b0df0778fd /ui/app/components/pages/unlock.js | |
parent | 59c887301aba5d746d669441ec78ef7ec5de3146 (diff) | |
parent | 66ae4a948abbebdb513f9bd60d47fda36095e8df (diff) | |
download | tangerine-wallet-browser-02a6d2089ede7d3faf4990c40b85b9f773f82c64.tar.gz tangerine-wallet-browser-02a6d2089ede7d3faf4990c40b85b9f773f82c64.tar.zst tangerine-wallet-browser-02a6d2089ede7d3faf4990c40b85b9f773f82c64.zip |
Merge branch 'master' into i3725-refactor-send-component
Diffstat (limited to 'ui/app/components/pages/unlock.js')
-rw-r--r-- | ui/app/components/pages/unlock.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/app/components/pages/unlock.js b/ui/app/components/pages/unlock.js index b3320da21..30144b978 100644 --- a/ui/app/components/pages/unlock.js +++ b/ui/app/components/pages/unlock.js @@ -11,11 +11,12 @@ const { setNetworkEndpoints, setFeatureFlag, } = require('../../actions') -const environmentType = require('../../../../app/scripts/lib/environment-type') +const { ENVIRONMENT_TYPE_POPUP } = require('../../../../app/scripts/lib/enums') +const { getEnvironmentType } = require('../../../../app/scripts/lib/util') const getCaretCoordinates = require('textarea-caret') const EventEmitter = require('events').EventEmitter const Mascot = require('../mascot') -const { OLD_UI_NETWORK_TYPE } = require('../../../../app/scripts/config').enums +const { OLD_UI_NETWORK_TYPE } = require('../../../../app/scripts/controllers/network/enums') const { DEFAULT_ROUTE, RESTORE_VAULT_ROUTE } = require('../../routes') class UnlockScreen extends Component { @@ -131,7 +132,7 @@ class UnlockScreen extends Component { this.props.markPasswordForgotten() this.props.history.push(RESTORE_VAULT_ROUTE) - if (environmentType() === 'popup') { + if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP) { global.platform.openExtensionInBrowser() } }, |