diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-04-18 00:38:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-18 00:38:38 +0800 |
| commit | bdec1bc90b4f057eae77d2986b228c4ef2e7dfb8 (patch) | |
| tree | a1b0877175b6555dcded6bb61bc07e1ada81e12d /ui/app/reducers/metamask.js | |
| parent | e4eb69dcc290a7e7eb27cab7ec57a8097345d81e (diff) | |
| parent | b0a105ce809b8b7e5e4431bd1ddecc523586cad0 (diff) | |
| download | tangerine-wallet-browser-bdec1bc90b4f057eae77d2986b228c4ef2e7dfb8.tar tangerine-wallet-browser-bdec1bc90b4f057eae77d2986b228c4ef2e7dfb8.tar.gz tangerine-wallet-browser-bdec1bc90b4f057eae77d2986b228c4ef2e7dfb8.tar.bz2 tangerine-wallet-browser-bdec1bc90b4f057eae77d2986b228c4ef2e7dfb8.tar.lz tangerine-wallet-browser-bdec1bc90b4f057eae77d2986b228c4ef2e7dfb8.tar.xz tangerine-wallet-browser-bdec1bc90b4f057eae77d2986b228c4ef2e7dfb8.tar.zst tangerine-wallet-browser-bdec1bc90b4f057eae77d2986b228c4ef2e7dfb8.zip | |
Merge pull request #3995 from MetaMask/i3759-popup
Fix confirmation popup not always opening
Diffstat (limited to 'ui/app/reducers/metamask.js')
| -rw-r--r-- | ui/app/reducers/metamask.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index e65dc2d11..5f965fbe0 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -1,7 +1,8 @@ const extend = require('xtend') const actions = require('../actions') const MetamascaraPlatform = require('../../../app/scripts/platforms/window') -const environmentType = require('../../../app/scripts/lib/environment-type') +const { getEnvironmentType } = require('../../../app/scripts/lib/util') +const { ENVIRONMENT_TYPE_POPUP } = require('../../../app/scripts/lib/enums') const { OLD_UI_NETWORK_TYPE } = require('../../../app/scripts/config').enums module.exports = reduceMetamask @@ -15,7 +16,7 @@ function reduceMetamask (state, action) { isUnlocked: false, isAccountMenuOpen: false, isMascara: window.platform instanceof MetamascaraPlatform, - isPopup: environmentType() === 'popup', + isPopup: getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: {}, unapprovedTxs: {}, |