m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Replace METAMASK_UI_TYPE global with helper function (#8279)

Browse Source 
We don't need to store the current UI type as a global. We're already
using the `getEnvironmentType` helper function throughout the UI, so
we'd might as well use that instead of this global state.
This commit is contained in:
Mark Stacey 2020-04-01 19:28:10 -03:00 committed by GitHub
parent 043ed6cbdb
commit 44effa0d91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/scripts/phishing-detect.js
View File

@ -10,16 +10,14 @@ import ExtensionPlatform from './platforms/extension'
document.addEventListener('DOMContentLoaded', start) document.addEventListener('DOMContentLoaded', start)
function start () { function start () {
const windowType = getEnvironmentType()
const hash = window.location.hash.substring(1) const hash = window.location.hash.substring(1)
const suspect = querystring.parse(hash) const suspect = querystring.parse(hash)
document.getElementById('csdbLink').href = `https://cryptoscamdb.org/search` document.getElementById('csdbLink').href = `https://cryptoscamdb.org/search`
global.platform = new ExtensionPlatform() global.platform = new ExtensionPlatform()
global.METAMASK_UI_TYPE = windowType
const extensionPort = extension.runtime.connect({ name: windowType }) const extensionPort = extension.runtime.connect({ name: getEnvironmentType() })
const connectionStream = new PortStream(extensionPort) const connectionStream = new PortStream(extensionPort)
const mx = setupMultiplex(connectionStream) const mx = setupMultiplex(connectionStream)
setupControllerConnection(mx.createStream('controller'), (err, metaMaskController) => { setupControllerConnection(mx.createStream('controller'), (err, metaMaskController) => {

1
app/scripts/ui.js
View File

@ -55,7 +55,6 @@ async function start () {
// identify window type (popup, notification) // identify window type (popup, notification)
const windowType = getEnvironmentType() const windowType = getEnvironmentType()
global.METAMASK_UI_TYPE = windowType
closePopupIfOpen(windowType) closePopupIfOpen(windowType)
// setup stream to background // setup stream to background

3
ui/app/components/app/confirm-page-container/confirm-page-container-header/confirm-page-container-header.component.js
View File

@ -4,6 +4,7 @@ import {
ENVIRONMENT_TYPE_POPUP, ENVIRONMENT_TYPE_POPUP,
ENVIRONMENT_TYPE_NOTIFICATION, ENVIRONMENT_TYPE_NOTIFICATION,
} from '../../../../../../app/scripts/lib/enums' } from '../../../../../../app/scripts/lib/enums'
import { getEnvironmentType } from '../../../../../../app/scripts/lib/util'
import NetworkDisplay from '../../network-display' import NetworkDisplay from '../../network-display'
import Identicon from '../../../ui/identicon' import Identicon from '../../../ui/identicon'
import { addressSlicer } from '../../../../helpers/utils/util' import { addressSlicer } from '../../../../helpers/utils/util'
@ -23,7 +24,7 @@ export default class ConfirmPageContainerHeader extends Component {
renderTop () { renderTop () {
const { onEdit, showEdit, accountAddress, showAccountInHeader } = this.props const { onEdit, showEdit, accountAddress, showAccountInHeader } = this.props
const windowType = window.METAMASK_UI_TYPE const windowType = getEnvironmentType()
const isFullScreen = windowType !== ENVIRONMENT_TYPE_NOTIFICATION && const isFullScreen = windowType !== ENVIRONMENT_TYPE_NOTIFICATION &&
windowType !== ENVIRONMENT_TYPE_POPUP windowType !== ENVIRONMENT_TYPE_POPUP

7
ui/app/pages/routes/routes.component.js
View File

@ -50,6 +50,7 @@ import {
} from '../../helpers/constants/routes' } from '../../helpers/constants/routes'
import { ENVIRONMENT_TYPE_NOTIFICATION, ENVIRONMENT_TYPE_POPUP } from '../../../../app/scripts/lib/enums' import { ENVIRONMENT_TYPE_NOTIFICATION, ENVIRONMENT_TYPE_POPUP } from '../../../../app/scripts/lib/enums'
import { getEnvironmentType } from '../../../../app/scripts/lib/util'
export default class Routes extends Component { export default class Routes extends Component {
static propTypes = { static propTypes = {
@ -160,11 +161,13 @@ export default class Routes extends Component {
return true return true
} }
if (window.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION) { const windowType = getEnvironmentType()
if (windowType === ENVIRONMENT_TYPE_NOTIFICATION) {
return true return true
} }
if (window.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_POPUP) { if (windowType === ENVIRONMENT_TYPE_POPUP) {
return this.onConfirmPage() || hasPermissionsRequests return this.onConfirmPage() || hasPermissionsRequests
} }

7
ui/app/store/actions.js
View File

@ -13,6 +13,7 @@ import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../app/scripts/lib/enums'
import { hasUnconfirmedTransactions } from '../helpers/utils/confirm-tx.util' import { hasUnconfirmedTransactions } from '../helpers/utils/confirm-tx.util'
import { setCustomGasLimit } from '../ducks/gas/gas.duck' import { setCustomGasLimit } from '../ducks/gas/gas.duck'
import txHelper from '../../lib/tx-helper' import txHelper from '../../lib/tx-helper'
import { getEnvironmentType } from '../../../app/scripts/lib/util'
export const actionConstants = { export const actionConstants = {
GO_HOME: 'GO_HOME', GO_HOME: 'GO_HOME',
@ -1194,7 +1195,7 @@ export function cancelTxs (txDataList) {
dispatch(hideLoadingIndication()) dispatch(hideLoadingIndication())
if (global.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION) { if (getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION) {
return global.platform.closeCurrentWindow() return global.platform.closeCurrentWindow()
} }
} }
@ -1431,7 +1432,7 @@ export function removeSuggestedTokens () {
dispatch(displayWarning(err.message)) dispatch(displayWarning(err.message))
} }
dispatch(clearPendingTokens()) dispatch(clearPendingTokens())
if (global.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION) { if (getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION) {
return global.platform.closeCurrentWindow() return global.platform.closeCurrentWindow()
} }
resolve(suggestedTokens) resolve(suggestedTokens)
@ -1724,7 +1725,7 @@ export function hideModal (payload) {
export function closeCurrentNotificationWindow () { export function closeCurrentNotificationWindow () {
return (dispatch, getState) => { return (dispatch, getState) => {
if (global.METAMASK_UI_TYPE === ENVIRONMENT_TYPE_NOTIFICATION && if (getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION &&
!hasUnconfirmedTransactions(getState())) { !hasUnconfirmedTransactions(getState())) {
global.platform.closeCurrentWindow() global.platform.closeCurrentWindow()