mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Enable core ESLint no-mixed-operators rule
This commit is contained in:
parent
f26f52560d
commit
da0300d3b1
@ -45,6 +45,7 @@ module.exports = {
|
|||||||
|
|
||||||
rules: {
|
rules: {
|
||||||
'arrow-parens': 'error',
|
'arrow-parens': 'error',
|
||||||
|
'no-mixed-operators': 'error',
|
||||||
'import/default': 'error',
|
'import/default': 'error',
|
||||||
'import/export': 'error',
|
'import/export': 'error',
|
||||||
'import/named': 'error',
|
'import/named': 'error',
|
||||||
|
@ -652,7 +652,7 @@ class TransactionController extends EventEmitter {
|
|||||||
*/
|
*/
|
||||||
async _determineTransactionCategory (txParams) {
|
async _determineTransactionCategory (txParams) {
|
||||||
const { data, to } = txParams
|
const { data, to } = txParams
|
||||||
const { name } = data && abiDecoder.decodeMethod(data) || {}
|
const { name } = (data && abiDecoder.decodeMethod(data)) || {}
|
||||||
const tokenMethodName = [
|
const tokenMethodName = [
|
||||||
TOKEN_METHOD_APPROVE,
|
TOKEN_METHOD_APPROVE,
|
||||||
TOKEN_METHOD_TRANSFER,
|
TOKEN_METHOD_TRANSFER,
|
||||||
|
@ -31,7 +31,7 @@ const packageJSON = require('./package.json')
|
|||||||
|
|
||||||
sass.compiler = require('node-sass')
|
sass.compiler = require('node-sass')
|
||||||
|
|
||||||
const dependencies = Object.keys(packageJSON && packageJSON.dependencies || {})
|
const dependencies = Object.keys((packageJSON && packageJSON.dependencies) || {})
|
||||||
const materialUIDependencies = ['@material-ui/core']
|
const materialUIDependencies = ['@material-ui/core']
|
||||||
const reactDepenendencies = dependencies.filter((dep) => dep.match(/react/))
|
const reactDepenendencies = dependencies.filter((dep) => dep.match(/react/))
|
||||||
const d3Dependencies = ['c3', 'd3']
|
const d3Dependencies = ['c3', 'd3']
|
||||||
|
@ -44,9 +44,9 @@ export default class GasPriceChart extends Component {
|
|||||||
const { x: yAxisX } = getCoordinateData('.c3-axis-y-label')
|
const { x: yAxisX } = getCoordinateData('.c3-axis-y-label')
|
||||||
const { x: tickX } = getCoordinateData('.c3-axis-x .tick')
|
const { x: tickX } = getCoordinateData('.c3-axis-x .tick')
|
||||||
|
|
||||||
d3.select('.c3-axis-x .tick').attr('transform', 'translate(' + (domainX - tickX) / 2 + ', 0)')
|
d3.select('.c3-axis-x .tick').attr('transform', `translate(${(domainX - tickX) / 2}, 0)`)
|
||||||
d3.select('.c3-axis-x-label').attr('transform', 'translate(0,-15)')
|
d3.select('.c3-axis-x-label').attr('transform', 'translate(0,-15)')
|
||||||
d3.select('.c3-axis-y-label').attr('transform', 'translate(' + (domainX - yAxisX - 12) + ', 2) rotate(-90)')
|
d3.select('.c3-axis-y-label').attr('transform', `translate(${domainX - yAxisX - 12}, 2) rotate(-90)`)
|
||||||
d3.select('.c3-xgrid-focus line').attr('y2', 98)
|
d3.select('.c3-xgrid-focus line').attr('y2', 98)
|
||||||
|
|
||||||
d3.select('.c3-chart').on('mouseout', () => {
|
d3.select('.c3-chart').on('mouseout', () => {
|
||||||
|
@ -90,7 +90,7 @@ export function getActivities (transaction, isFirstTransaction = false) {
|
|||||||
const { op, path, value, timestamp: entryTimestamp } = entry
|
const { op, path, value, timestamp: entryTimestamp } = entry
|
||||||
// Not all sub-entries in a history entry have a timestamp. If the sub-entry does not have a
|
// Not all sub-entries in a history entry have a timestamp. If the sub-entry does not have a
|
||||||
// timestamp, the first sub-entry in a history entry should.
|
// timestamp, the first sub-entry in a history entry should.
|
||||||
const timestamp = entryTimestamp || base[0] && base[0].timestamp
|
const timestamp = entryTimestamp || (base[0] && base[0].timestamp)
|
||||||
|
|
||||||
if (path in eventPathsHash && op === REPLACE_OP) {
|
if (path in eventPathsHash && op === REPLACE_OP) {
|
||||||
switch (path) {
|
switch (path) {
|
||||||
|
@ -12,7 +12,7 @@ const mapStateToProps = (state, ownProps) => {
|
|||||||
|
|
||||||
const gasLimit = typeof gasUsed === 'string' ? gasUsed : gas
|
const gasLimit = typeof gasUsed === 'string' ? gasUsed : gas
|
||||||
|
|
||||||
const hexGasTotal = gasLimit && gasPrice && getHexGasTotal({ gasLimit, gasPrice }) || '0x0'
|
const hexGasTotal = (gasLimit && gasPrice && getHexGasTotal({ gasLimit, gasPrice })) || '0x0'
|
||||||
const totalInHex = sumHexes(hexGasTotal, value)
|
const totalInHex = sumHexes(hexGasTotal, value)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
@ -18,7 +18,7 @@ const mapStateToProps = (state, ownProps) => {
|
|||||||
const entry = addressBook.find((contact) => {
|
const entry = addressBook.find((contact) => {
|
||||||
return address.toLowerCase() === contact.address.toLowerCase()
|
return address.toLowerCase() === contact.address.toLowerCase()
|
||||||
})
|
})
|
||||||
return entry && entry.name || ''
|
return (entry && entry.name) || ''
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
@ -195,7 +195,7 @@ export default class TransactionListItem extends PureComponent {
|
|||||||
const { showTransactionDetails } = this.state
|
const { showTransactionDetails } = this.state
|
||||||
const fromAddress = txParams.from
|
const fromAddress = txParams.from
|
||||||
const toAddress = tokenData
|
const toAddress = tokenData
|
||||||
? tokenData.params && tokenData.params[0] && tokenData.params[0].value || txParams.to
|
? (tokenData.params && tokenData.params[0] && tokenData.params[0].value) || txParams.to
|
||||||
: txParams.to
|
: txParams.to
|
||||||
|
|
||||||
const isFullScreen = getEnvironmentType() === ENVIRONMENT_TYPE_FULLSCREEN
|
const isFullScreen = getEnvironmentType() === ENVIRONMENT_TYPE_FULLSCREEN
|
||||||
|
@ -34,14 +34,14 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
|
|||||||
|
|
||||||
let currency, numberOfDecimals, prefix
|
let currency, numberOfDecimals, prefix
|
||||||
|
|
||||||
if (type === PRIMARY && useNativeCurrencyAsPrimaryCurrency ||
|
if ((type === PRIMARY && useNativeCurrencyAsPrimaryCurrency) ||
|
||||||
type === SECONDARY && !useNativeCurrencyAsPrimaryCurrency) {
|
(type === SECONDARY && !useNativeCurrencyAsPrimaryCurrency)) {
|
||||||
// Display ETH
|
// Display ETH
|
||||||
currency = nativeCurrency || ETH
|
currency = nativeCurrency || ETH
|
||||||
numberOfDecimals = propsNumberOfDecimals || ethNumberOfDecimals || 6
|
numberOfDecimals = propsNumberOfDecimals || ethNumberOfDecimals || 6
|
||||||
prefix = propsPrefix || ethPrefix
|
prefix = propsPrefix || ethPrefix
|
||||||
} else if (type === SECONDARY && useNativeCurrencyAsPrimaryCurrency ||
|
} else if ((type === SECONDARY && useNativeCurrencyAsPrimaryCurrency) ||
|
||||||
type === PRIMARY && !useNativeCurrencyAsPrimaryCurrency) {
|
(type === PRIMARY && !useNativeCurrencyAsPrimaryCurrency)) {
|
||||||
// Display Fiat
|
// Display Fiat
|
||||||
numberOfDecimals = propsNumberOfDecimals || fiatNumberOfDecimals || 2
|
numberOfDecimals = propsNumberOfDecimals || fiatNumberOfDecimals || 2
|
||||||
prefix = propsPrefix || fiatPrefix
|
prefix = propsPrefix || fiatPrefix
|
||||||
|
@ -23,7 +23,7 @@ export default class CurrencyDisplay extends PureComponent {
|
|||||||
<div
|
<div
|
||||||
className={classnames('currency-display-component', className)}
|
className={classnames('currency-display-component', className)}
|
||||||
style={style}
|
style={style}
|
||||||
title={!hideTitle && title || null}
|
title={(!hideTitle && title) || null}
|
||||||
>
|
>
|
||||||
{ prefixComponent }
|
{ prefixComponent }
|
||||||
<span className="currency-display-component__text">{ text }</span>
|
<span className="currency-display-component__text">{ text }</span>
|
||||||
|
@ -647,7 +647,7 @@ describe('Gas Duck', function () {
|
|||||||
|
|
||||||
const { type: thirdDispatchCallType, value: priceAndTimeEstimateResult } = mockDistpatch.getCall(2).args[0]
|
const { type: thirdDispatchCallType, value: priceAndTimeEstimateResult } = mockDistpatch.getCall(2).args[0]
|
||||||
assert.equal(thirdDispatchCallType, SET_PRICE_AND_TIME_ESTIMATES)
|
assert.equal(thirdDispatchCallType, SET_PRICE_AND_TIME_ESTIMATES)
|
||||||
assert(priceAndTimeEstimateResult.length < mockPredictTableResponse.length * 3 - 2)
|
assert(priceAndTimeEstimateResult.length < ((mockPredictTableResponse.length * 3) - 2))
|
||||||
assert(!priceAndTimeEstimateResult.find((d) => d.expectedTime > 100))
|
assert(!priceAndTimeEstimateResult.find((d) => d.expectedTime > 100))
|
||||||
assert(!priceAndTimeEstimateResult.find((d, _, a) => a[a + 1] && d.expectedTime > a[a + 1].expectedTime))
|
assert(!priceAndTimeEstimateResult.find((d, _, a) => a[a + 1] && d.expectedTime > a[a + 1].expectedTime))
|
||||||
assert(!priceAndTimeEstimateResult.find((d, _, a) => a[a + 1] && d.gasprice > a[a + 1].gasprice))
|
assert(!priceAndTimeEstimateResult.find((d, _, a) => a[a + 1] && d.gasprice > a[a + 1].gasprice))
|
||||||
|
@ -352,8 +352,8 @@ function quartiles (data) {
|
|||||||
function inliersByIQR (data, prop) {
|
function inliersByIQR (data, prop) {
|
||||||
const { lowerQuartile, upperQuartile } = quartiles(data.map((d) => (prop ? d[prop] : d)))
|
const { lowerQuartile, upperQuartile } = quartiles(data.map((d) => (prop ? d[prop] : d)))
|
||||||
const IQR = upperQuartile - lowerQuartile
|
const IQR = upperQuartile - lowerQuartile
|
||||||
const lowerBound = lowerQuartile - 1.5 * IQR
|
const lowerBound = lowerQuartile - (1.5 * IQR)
|
||||||
const upperBound = upperQuartile + 1.5 * IQR
|
const upperBound = upperQuartile + (1.5 * IQR)
|
||||||
return data.filter((d) => {
|
return data.filter((d) => {
|
||||||
const value = prop ? d[prop] : d
|
const value = prop ? d[prop] : d
|
||||||
return value >= lowerBound && value <= upperBound
|
return value >= lowerBound && value <= upperBound
|
||||||
|
@ -145,7 +145,7 @@ function composeUrl (config) {
|
|||||||
const e_n = composeParamAddition(eventOpts.name, 'e_n')
|
const e_n = composeParamAddition(eventOpts.name, 'e_n')
|
||||||
const new_visit = isNewVisit ? `&new_visit=1` : ''
|
const new_visit = isNewVisit ? `&new_visit=1` : ''
|
||||||
|
|
||||||
const cvar = customVariables && composeCustomVarParamAddition(customVariables) || ''
|
const cvar = (customVariables && composeCustomVarParamAddition(customVariables)) || ''
|
||||||
|
|
||||||
const action_name = ''
|
const action_name = ''
|
||||||
|
|
||||||
@ -156,13 +156,13 @@ function composeUrl (config) {
|
|||||||
environmentType,
|
environmentType,
|
||||||
activeCurrency,
|
activeCurrency,
|
||||||
accountType,
|
accountType,
|
||||||
numberOfTokens: customVariables && customVariables.numberOfTokens || numberOfTokens,
|
numberOfTokens: (customVariables && customVariables.numberOfTokens) || numberOfTokens,
|
||||||
numberOfAccounts: customVariables && customVariables.numberOfAccounts || numberOfAccounts,
|
numberOfAccounts: (customVariables && customVariables.numberOfAccounts) || numberOfAccounts,
|
||||||
}) : ''
|
}) : ''
|
||||||
const url = configUrl || currentPath ? `&url=${encodeURIComponent(currentPath.replace(/chrome-extension:\/\/\w+/, METAMETRICS_TRACKING_URL))}` : ''
|
const url = configUrl || currentPath ? `&url=${encodeURIComponent(currentPath.replace(/chrome-extension:\/\/\w+/, METAMETRICS_TRACKING_URL))}` : ''
|
||||||
const _id = metaMetricsId && !excludeMetaMetricsId ? `&_id=${metaMetricsId.slice(2, 18)}` : ''
|
const _id = metaMetricsId && !excludeMetaMetricsId ? `&_id=${metaMetricsId.slice(2, 18)}` : ''
|
||||||
const rand = `&rand=${String(Math.random()).slice(2)}`
|
const rand = `&rand=${String(Math.random()).slice(2)}`
|
||||||
const pv_id = (url || currentPath) && `&pv_id=${ethUtil.bufferToHex(ethUtil.sha3(url || currentPath.match(/chrome-extension:\/\/\w+\/(.+)/)[0])).slice(2, 8)}` || ''
|
const pv_id = ((url || currentPath) && `&pv_id=${ethUtil.bufferToHex(ethUtil.sha3(url || currentPath.match(/chrome-extension:\/\/\w+\/(.+)/)[0])).slice(2, 8)}`) || ''
|
||||||
const uid = metaMetricsId && !excludeMetaMetricsId
|
const uid = metaMetricsId && !excludeMetaMetricsId
|
||||||
? `&uid=${metaMetricsId.slice(2, 18)}`
|
? `&uid=${metaMetricsId.slice(2, 18)}`
|
||||||
: excludeMetaMetricsId
|
: excludeMetaMetricsId
|
||||||
|
@ -77,7 +77,7 @@ const mapStateToProps = (state, ownProps) => {
|
|||||||
gas: gasLimit,
|
gas: gasLimit,
|
||||||
value: amount,
|
value: amount,
|
||||||
data,
|
data,
|
||||||
} = transaction && transaction.txParams || txParams
|
} = (transaction && transaction.txParams) || txParams
|
||||||
const accounts = getMetaMaskAccounts(state)
|
const accounts = getMetaMaskAccounts(state)
|
||||||
const assetImage = assetImages[txParamsToAddress]
|
const assetImage = assetImages[txParamsToAddress]
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ class ConnectHardwareForm extends Component {
|
|||||||
const { accounts } = nextProps
|
const { accounts } = nextProps
|
||||||
const newAccounts = this.state.accounts.map((a) => {
|
const newAccounts = this.state.accounts.map((a) => {
|
||||||
const normalizedAddress = a.address.toLowerCase()
|
const normalizedAddress = a.address.toLowerCase()
|
||||||
const balanceValue = accounts[normalizedAddress] && accounts[normalizedAddress].balance || null
|
const balanceValue = (accounts[normalizedAddress] && accounts[normalizedAddress].balance) || null
|
||||||
a.balance = balanceValue ? formatBalance(balanceValue, 6) : '...'
|
a.balance = balanceValue ? formatBalance(balanceValue, 6) : '...'
|
||||||
return a
|
return a
|
||||||
})
|
})
|
||||||
@ -103,7 +103,7 @@ class ConnectHardwareForm extends Component {
|
|||||||
// Map accounts with balances
|
// Map accounts with balances
|
||||||
newState.accounts = accounts.map((account) => {
|
newState.accounts = accounts.map((account) => {
|
||||||
const normalizedAddress = account.address.toLowerCase()
|
const normalizedAddress = account.address.toLowerCase()
|
||||||
const balanceValue = this.props.accounts[normalizedAddress] && this.props.accounts[normalizedAddress].balance || null
|
const balanceValue = (this.props.accounts[normalizedAddress] && this.props.accounts[normalizedAddress].balance) || null
|
||||||
account.balance = balanceValue ? formatBalance(balanceValue, 6) : '...'
|
account.balance = balanceValue ? formatBalance(balanceValue, 6) : '...'
|
||||||
return account
|
return account
|
||||||
})
|
})
|
||||||
|
@ -72,9 +72,9 @@ export default class PermissionConnect extends Component {
|
|||||||
const { originName, page } = this.state
|
const { originName, page } = this.state
|
||||||
|
|
||||||
if (!permissionsRequest && prevProps.permissionsRequest && page !== null) {
|
if (!permissionsRequest && prevProps.permissionsRequest && page !== null) {
|
||||||
const permissionDataForDomain = domains && domains[originName] || {}
|
const permissionDataForDomain = (domains && domains[originName]) || {}
|
||||||
const permissionsForDomain = permissionDataForDomain.permissions || []
|
const permissionsForDomain = permissionDataForDomain.permissions || []
|
||||||
const prevPermissionDataForDomain = prevProps.domains && prevProps.domains[originName] || {}
|
const prevPermissionDataForDomain = (prevProps.domains && prevProps.domains[originName]) || {}
|
||||||
const prevPermissionsForDomain = prevPermissionDataForDomain.permissions || []
|
const prevPermissionsForDomain = prevPermissionDataForDomain.permissions || []
|
||||||
const addedAPermission = permissionsForDomain.length > prevPermissionsForDomain.length
|
const addedAPermission = permissionsForDomain.length > prevPermissionsForDomain.length
|
||||||
if (addedAPermission) {
|
if (addedAPermission) {
|
||||||
|
@ -115,7 +115,7 @@ export function getSelectedTokenExchangeRate (state) {
|
|||||||
const selectedToken = getSelectedToken(state) || {}
|
const selectedToken = getSelectedToken(state) || {}
|
||||||
const { symbol = '' } = selectedToken
|
const { symbol = '' } = selectedToken
|
||||||
const pair = `${symbol.toLowerCase()}_eth`
|
const pair = `${symbol.toLowerCase()}_eth`
|
||||||
const { rate: tokenExchangeRate = 0 } = tokenExchangeRates && tokenExchangeRates[pair] || {}
|
const { rate: tokenExchangeRate = 0 } = (tokenExchangeRates && tokenExchangeRates[pair]) || {}
|
||||||
|
|
||||||
return tokenExchangeRate
|
return tokenExchangeRate
|
||||||
}
|
}
|
||||||
|
@ -195,7 +195,7 @@ export default class NetworksTab extends PureComponent {
|
|||||||
rpcUrls={networksToRender.map((network) => network.rpcUrl)}
|
rpcUrls={networksToRender.map((network) => network.rpcUrl)}
|
||||||
setRpcTarget={setRpcTarget}
|
setRpcTarget={setRpcTarget}
|
||||||
editRpc={editRpc}
|
editRpc={editRpc}
|
||||||
networkName={label || labelKey && t(labelKey) || ''}
|
networkName={label || (labelKey && t(labelKey)) || ''}
|
||||||
rpcUrl={rpcUrl}
|
rpcUrl={rpcUrl}
|
||||||
chainId={chainId}
|
chainId={chainId}
|
||||||
ticker={ticker}
|
ticker={ticker}
|
||||||
|
@ -32,7 +32,7 @@ const mapStateToProps = (state) => {
|
|||||||
rpcUrl: rpc.rpcUrl,
|
rpcUrl: rpc.rpcUrl,
|
||||||
chainId: rpc.chainId,
|
chainId: rpc.chainId,
|
||||||
ticker: rpc.ticker,
|
ticker: rpc.ticker,
|
||||||
blockExplorerUrl: rpc.rpcPrefs && rpc.rpcPrefs.blockExplorerUrl || '',
|
blockExplorerUrl: (rpc.rpcPrefs && rpc.rpcPrefs.blockExplorerUrl) || '',
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -43,7 +43,7 @@ const mapStateToProps = (state) => {
|
|||||||
let networkDefaultedToProvider = false
|
let networkDefaultedToProvider = false
|
||||||
if (!networkIsSelected && !networksTabIsInAddMode) {
|
if (!networkIsSelected && !networksTabIsInAddMode) {
|
||||||
selectedNetwork = networksToRender.find((network) => {
|
selectedNetwork = networksToRender.find((network) => {
|
||||||
return network.rpcUrl === provider.rpcTarget || network.providerType !== 'rpc' && network.providerType === provider.type
|
return network.rpcUrl === provider.rpcTarget || (network.providerType !== 'rpc' && network.providerType === provider.type)
|
||||||
}) || {}
|
}) || {}
|
||||||
networkDefaultedToProvider = true
|
networkDefaultedToProvider = true
|
||||||
}
|
}
|
||||||
|
@ -118,12 +118,12 @@ const tokenDecimalsSelector = createSelector(
|
|||||||
|
|
||||||
const tokenDataParamsSelector = createSelector(
|
const tokenDataParamsSelector = createSelector(
|
||||||
tokenDataSelector,
|
tokenDataSelector,
|
||||||
(tokenData) => tokenData && tokenData.params || []
|
(tokenData) => (tokenData && tokenData.params) || []
|
||||||
)
|
)
|
||||||
|
|
||||||
const txParamsSelector = createSelector(
|
const txParamsSelector = createSelector(
|
||||||
txDataSelector,
|
txDataSelector,
|
||||||
(txData) => txData && txData.txParams || {}
|
(txData) => (txData && txData.txParams) || {}
|
||||||
)
|
)
|
||||||
|
|
||||||
export const tokenAddressSelector = createSelector(
|
export const tokenAddressSelector = createSelector(
|
||||||
|
@ -56,7 +56,7 @@ export function getAccountType (state) {
|
|||||||
|
|
||||||
export function getSelectedAsset (state) {
|
export function getSelectedAsset (state) {
|
||||||
const selectedToken = getSelectedToken(state)
|
const selectedToken = getSelectedToken(state)
|
||||||
return selectedToken && selectedToken.symbol || 'ETH'
|
return (selectedToken && selectedToken.symbol) || 'ETH'
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getCurrentNetworkId (state) {
|
export function getCurrentNetworkId (state) {
|
||||||
|
Loading…
Reference in New Issue
Block a user