Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecessary get environment type parameter #7891

Merged
merged 3 commits into from
Jan 24, 2020
Merged

Remove unnecessary get environment type parameter #7891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
914ebee
Remove unnecessary `getEnvironmentType` parameter
Gudahtt Jan 24, 2020
5279f29
Remove junk parameter from `getEnvironmentType` invocation
Gudahtt Jan 24, 2020
a577dc4
Fix comment for `getEnvironmentType`
Gudahtt Jan 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/scripts/lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
/**
* Used to determine the window type through which the app is being viewed.
* - 'popup' refers to the extension opened through the browser app icon (in top right corner in chrome and firefox)
* - 'responsive' refers to the main browser window
* - 'fullscreen' refers to the main browser window
* - 'notification' refers to the popup that appears in its own window when taking action outside of metamask
* - 'background' refers to the background page
*
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/phishing-detect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import ExtensionPlatform from './platforms/extension'
document.addEventListener('DOMContentLoaded', start)

function start () {
const windowType = getEnvironmentType(window.location.href)
const windowType = getEnvironmentType()
const hash = window.location.hash.substring(1)
const suspect = querystring.parse(hash)

Expand Down
2 changes: 1 addition & 1 deletion app/scripts/ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ async function start () {
}

// identify window type (popup, notification)
const windowType = getEnvironmentType(window.location.href)
const windowType = getEnvironmentType()
global.METAMASK_UI_TYPE = windowType
closePopupIfOpen(windowType)

Expand Down
2 changes: 1 addition & 1 deletion ui/app/components/app/account-menu/account-menu.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ export default class AccountMenu extends Component {
name: 'Clicked Connect Hardware',
},
})
if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP) {
if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) {
global.platform.openExtensionInBrowser(CONNECT_HARDWARE_ROUTE)
} else {
history.push(CONNECT_HARDWARE_ROUTE)
Expand Down
6 changes: 3 additions & 3 deletions ui/app/components/app/modals/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ const MODALS = {
contents: <HideTokenConfirmationModal />,
mobileModalStyle: {
width: '95%',
top: getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP ? '52vh' : '36.5vh',
top: getEnvironmentType() === ENVIRONMENT_TYPE_POPUP ? '52vh' : '36.5vh',
},
laptopModalStyle: {
width: '449px',
Expand Down Expand Up @@ -265,7 +265,7 @@ const MODALS = {
contents: <NotifcationModal header="gasPriceNoDenom" message="gasPriceInfoModalContent" />,
mobileModalStyle: {
width: '95%',
top: getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP ? '52vh' : '36.5vh',
top: getEnvironmentType() === ENVIRONMENT_TYPE_POPUP ? '52vh' : '36.5vh',
},
laptopModalStyle: {
width: '449px',
Expand All @@ -277,7 +277,7 @@ const MODALS = {
contents: <NotifcationModal header="gasLimit" message="gasLimitInfoModalContent" />,
mobileModalStyle: {
width: '95%',
top: getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP ? '52vh' : '36.5vh',
top: getEnvironmentType() === ENVIRONMENT_TYPE_POPUP ? '52vh' : '36.5vh',
},
laptopModalStyle: {
width: '449px',
Expand Down
4 changes: 2 additions & 2 deletions ui/app/components/app/signature-request-original/signature-request-original.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default class SignatureRequestOriginal extends Component {
}

componentDidMount = () => {
if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_NOTIFICATION) {
if (getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION) {
window.addEventListener('beforeunload', this._beforeUnload)
}
}
Expand All @@ -59,7 +59,7 @@ export default class SignatureRequestOriginal extends Component {
}

_removeBeforeUnload = () => {
if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_NOTIFICATION) {
if (getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION) {
window.removeEventListener('beforeunload', this._beforeUnload)
}
}
Expand Down
2 changes: 1 addition & 1 deletion ui/app/components/app/signature-request/signature-request.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default class SignatureRequest extends PureComponent {
componentDidMount () {
const { clearConfirmTransaction, cancel } = this.props
const { metricsEvent } = this.context
if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_NOTIFICATION) {
if (getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION) {
window.addEventListener('beforeunload', (event) => {
metricsEvent({
eventOpts: {
Expand Down
2 changes: 1 addition & 1 deletion ui/app/components/app/transaction-list-item/transaction-list-item.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ export default class TransactionListItem extends PureComponent {
? tokenData.params && tokenData.params[0] && tokenData.params[0].value || txParams.to
: txParams.to

const isFullScreen = getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_FULLSCREEN
const isFullScreen = getEnvironmentType() === ENVIRONMENT_TYPE_FULLSCREEN
const showEstimatedTime = transactionTimeFeatureActive &&
(transaction.id === firstPendingTransactionId) &&
isFullScreen
Expand Down
2 changes: 1 addition & 1 deletion ui/app/ducks/metamask/metamask.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function reduceMetamask (state, action) {
isInitialized: false,
isUnlocked: false,
isAccountMenuOpen: false,
isPopup: getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP,
isPopup: getEnvironmentType() === ENVIRONMENT_TYPE_POPUP,
rpcTarget: 'https://rawtestrpc.metamask.io/',
identities: {},
unapprovedTxs: {},
Expand Down
4 changes: 2 additions & 2 deletions ui/app/pages/confirm-transaction-base/confirm-transaction-base.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ export default class ConfirmTransactionBase extends Component {
}

_removeBeforeUnload = () => {
if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_NOTIFICATION) {
if (getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION) {
window.removeEventListener('beforeunload', this._beforeUnload)
}
}
Expand All @@ -603,7 +603,7 @@ export default class ConfirmTransactionBase extends Component {
},
})

if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_NOTIFICATION) {
if (getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION) {
window.addEventListener('beforeunload', this._beforeUnload)
}

Expand Down
2 changes: 1 addition & 1 deletion ui/app/pages/home/home.container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const mapStateToProps = state => {
const accountBalance = getCurrentEthBalance(state)
const { forgottenPassword, threeBoxLastUpdated } = appState

const isPopup = getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP
const isPopup = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
const firstPermissionsRequest = getFirstPermissionRequest(state)
const firstPermissionsRequestId = (firstPermissionsRequest && firstPermissionsRequest.metadata)
? firstPermissionsRequest.metadata.id
Expand Down
10 changes: 5 additions & 5 deletions ui/app/pages/permissions-connect/permissions-connect.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export default class PermissionConnect extends Component {
}

removeBeforeUnload = () => {
if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_FULLSCREEN) {
if (getEnvironmentType() === ENVIRONMENT_TYPE_FULLSCREEN) {
window.removeEventListener('beforeunload', this.beforeUnload)
}
}
Expand Down Expand Up @@ -102,7 +102,7 @@ export default class PermissionConnect extends Component {
})
this.removeBeforeUnload()

if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_FULLSCREEN) {
if (getEnvironmentType() === ENVIRONMENT_TYPE_FULLSCREEN) {
setTimeout(async () => {
const currentTab = await global.platform.currentTab()
try {
Expand All @@ -113,9 +113,9 @@ export default class PermissionConnect extends Component {
global.platform.closeTab(currentTab.id)
}
}, 2000)
} else if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_NOTIFICATION) {
} else if (getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION) {
history.push(DEFAULT_ROUTE)
} else if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP) {
} else if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) {
history.push(CONNECTED_ROUTE)
}
}
Expand All @@ -134,7 +134,7 @@ export default class PermissionConnect extends Component {
return history.push(DEFAULT_ROUTE)
}

if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_FULLSCREEN) {
if (getEnvironmentType() === ENVIRONMENT_TYPE_FULLSCREEN) {
window.addEventListener('beforeunload', this.beforeUnload)
}
}
Expand Down
2 changes: 1 addition & 1 deletion ui/app/pages/settings/settings.container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const mapStateToProps = (state, ownProps) => {
const isEditContactPage = Boolean(pathname.match(CONTACT_EDIT_ROUTE))
const isEditMyAccountsContactPage = Boolean(pathname.match(CONTACT_MY_ACCOUNTS_EDIT_ROUTE))

const isPopupView = getEnvironmentType(location.href) === ENVIRONMENT_TYPE_POPUP
const isPopupView = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
const pathnameI18nKey = ROUTES_TO_I18N_KEYS[pathname]

let backRoute
Expand Down
2 changes: 1 addition & 1 deletion ui/app/pages/unlock-page/unlock-page.container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
markPasswordForgotten()
history.push(RESTORE_VAULT_ROUTE)

if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP) {
if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) {
global.platform.openExtensionInBrowser(RESTORE_VAULT_ROUTE)
}
}
Expand Down
2 changes: 1 addition & 1 deletion ui/lib/webcam-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { getEnvironmentType, getPlatform } from '../../app/scripts/lib/util'
class WebcamUtils {

static async checkStatus () {
const isPopup = getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP
const isPopup = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
const isFirefoxOrBrave = getPlatform() === (PLATFORM_FIREFOX || PLATFORM_BRAVE)

const devices = await window.navigator.mediaDevices.enumerateDevices()
Expand Down