mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 01:39:44 +01:00
More lint fixes
This commit is contained in:
parent
5a94775b3f
commit
56e9f98bd0
@ -190,6 +190,7 @@
|
|||||||
"enzyme": "^2.8.2",
|
"enzyme": "^2.8.2",
|
||||||
"eslint-plugin-chai": "0.0.1",
|
"eslint-plugin-chai": "0.0.1",
|
||||||
"eslint-plugin-mocha": "^4.9.0",
|
"eslint-plugin-mocha": "^4.9.0",
|
||||||
|
"eslint-plugin-react": "^7.4.0",
|
||||||
"eth-json-rpc-middleware": "^1.2.7",
|
"eth-json-rpc-middleware": "^1.2.7",
|
||||||
"fs-promise": "^2.0.3",
|
"fs-promise": "^2.0.3",
|
||||||
"gulp": "github:gulpjs/gulp#4.0",
|
"gulp": "github:gulpjs/gulp#4.0",
|
||||||
|
@ -430,7 +430,7 @@ function addNewAccount () {
|
|||||||
forceUpdateMetamaskState(dispatch)
|
forceUpdateMetamaskState(dispatch)
|
||||||
return resolve(newAccountAddress)
|
return resolve(newAccountAddress)
|
||||||
})
|
})
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -621,7 +621,7 @@ function updateSendErrors (error) {
|
|||||||
|
|
||||||
function clearSend () {
|
function clearSend () {
|
||||||
return {
|
return {
|
||||||
type: actions.CLEAR_SEND
|
type: actions.CLEAR_SEND,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1004,10 +1004,10 @@ function addTokens (tokens) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateTokens(newTokens) {
|
function updateTokens (newTokens) {
|
||||||
return {
|
return {
|
||||||
type: actions.UPDATE_TOKENS,
|
type: actions.UPDATE_TOKENS,
|
||||||
newTokens
|
newTokens,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1081,7 +1081,7 @@ function setProviderType (type) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateProviderType(type) {
|
function updateProviderType (type) {
|
||||||
return {
|
return {
|
||||||
type: actions.SET_PROVIDER_TYPE,
|
type: actions.SET_PROVIDER_TYPE,
|
||||||
value: type,
|
value: type,
|
||||||
@ -1239,7 +1239,7 @@ function exportAccount (password, address) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function exportAccountComplete() {
|
function exportAccountComplete () {
|
||||||
return {
|
return {
|
||||||
type: actions.EXPORT_ACCOUNT,
|
type: actions.EXPORT_ACCOUNT,
|
||||||
}
|
}
|
||||||
|
@ -21,7 +21,7 @@ GasModalCard.prototype.render = function () {
|
|||||||
// max,
|
// max,
|
||||||
step,
|
step,
|
||||||
title,
|
title,
|
||||||
copy
|
copy,
|
||||||
} = this.props
|
} = this.props
|
||||||
|
|
||||||
return h('div.send-v2__gas-modal-card', [
|
return h('div.send-v2__gas-modal-card', [
|
||||||
|
@ -58,7 +58,7 @@ function mapDispatchToProps (dispatch) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function getOriginalState(props) {
|
function getOriginalState (props) {
|
||||||
const gasPrice = props.gasPrice || MIN_GAS_PRICE_DEC
|
const gasPrice = props.gasPrice || MIN_GAS_PRICE_DEC
|
||||||
const gasLimit = props.gasLimit || MIN_GAS_LIMIT_DEC
|
const gasLimit = props.gasLimit || MIN_GAS_LIMIT_DEC
|
||||||
|
|
||||||
@ -90,7 +90,7 @@ CustomizeGasModal.prototype.save = function (gasPrice, gasLimit, gasTotal) {
|
|||||||
updateGasPrice,
|
updateGasPrice,
|
||||||
updateGasLimit,
|
updateGasLimit,
|
||||||
hideModal,
|
hideModal,
|
||||||
updateGasTotal
|
updateGasTotal,
|
||||||
} = this.props
|
} = this.props
|
||||||
|
|
||||||
updateGasPrice(gasPrice)
|
updateGasPrice(gasPrice)
|
||||||
@ -260,7 +260,7 @@ CustomizeGasModal.prototype.render = function () {
|
|||||||
h(`div.send-v2__customize-gas__save${error ? '__error' : ''}`, {
|
h(`div.send-v2__customize-gas__save${error ? '__error' : ''}`, {
|
||||||
onClick: () => !error && this.save(gasPrice, gasLimit, gasTotal),
|
onClick: () => !error && this.save(gasPrice, gasLimit, gasTotal),
|
||||||
}, ['SAVE']),
|
}, ['SAVE']),
|
||||||
])
|
]),
|
||||||
|
|
||||||
]),
|
]),
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ AccountDropdownMini.prototype.renderDropdown = function () {
|
|||||||
closeDropdown()
|
closeDropdown()
|
||||||
},
|
},
|
||||||
icon: this.getListItemIcon(account, selectedAccount),
|
icon: this.getListItemIcon(account, selectedAccount),
|
||||||
}))
|
})),
|
||||||
|
|
||||||
]),
|
]),
|
||||||
|
|
||||||
@ -64,7 +64,7 @@ AccountDropdownMini.prototype.render = function () {
|
|||||||
handleClick: openDropdown,
|
handleClick: openDropdown,
|
||||||
displayBalance: false,
|
displayBalance: false,
|
||||||
displayAddress: false,
|
displayAddress: false,
|
||||||
icon: h(`i.fa.fa-caret-down.fa-lg`, { style: { color: '#dedede' } })
|
icon: h(`i.fa.fa-caret-down.fa-lg`, { style: { color: '#dedede' } }),
|
||||||
}),
|
}),
|
||||||
|
|
||||||
dropdownOpen && this.renderDropdown(),
|
dropdownOpen && this.renderDropdown(),
|
||||||
|
@ -10,7 +10,7 @@ function mapDispatchToProps (dispatch) {
|
|||||||
return {
|
return {
|
||||||
showHideTokenConfirmationModal: (token) => {
|
showHideTokenConfirmationModal: (token) => {
|
||||||
dispatch(actions.showModal({ name: 'HIDE_TOKEN_CONFIRMATION', token }))
|
dispatch(actions.showModal({ name: 'HIDE_TOKEN_CONFIRMATION', token }))
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -43,7 +43,7 @@ TokenMenuDropdown.prototype.render = function () {
|
|||||||
showHideTokenConfirmationModal(this.props.token)
|
showHideTokenConfirmationModal(this.props.token)
|
||||||
this.props.onClose()
|
this.props.onClose()
|
||||||
},
|
},
|
||||||
}, 'Hide Token')
|
}, 'Hide Token'),
|
||||||
|
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
|
@ -220,7 +220,7 @@ Modal.prototype.render = function () {
|
|||||||
|
|
||||||
const children = modal.contents
|
const children = modal.contents
|
||||||
const modalStyle = modal[isMobileView() ? 'mobileModalStyle' : 'laptopModalStyle']
|
const modalStyle = modal[isMobileView() ? 'mobileModalStyle' : 'laptopModalStyle']
|
||||||
const contentStyle = modal.contentStyle || {};
|
const contentStyle = modal.contentStyle || {}
|
||||||
|
|
||||||
return h(FadeModal,
|
return h(FadeModal,
|
||||||
{
|
{
|
||||||
|
@ -35,6 +35,6 @@ ShapeshiftDepositTxModal.prototype.render = function () {
|
|||||||
}, [
|
}, [
|
||||||
h('div', {}, [
|
h('div', {}, [
|
||||||
h(QrView, {key: 'qr', Qr}),
|
h(QrView, {key: 'qr', Qr}),
|
||||||
])
|
]),
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
const Component = require('react').Component
|
const Component = require('react').Component
|
||||||
const h = require('react-hyperscript')
|
const h = require('react-hyperscript')
|
||||||
const classnames = require('classnames');
|
const classnames = require('classnames')
|
||||||
const inherits = require('util').inherits
|
const inherits = require('util').inherits
|
||||||
const NetworkDropdownIcon = require('./dropdowns/components/network-dropdown-icon')
|
const NetworkDropdownIcon = require('./dropdowns/components/network-dropdown-icon')
|
||||||
|
|
||||||
|
@ -148,11 +148,11 @@ SendTokenScreen.prototype.setErrorsFor = function (field) {
|
|||||||
|
|
||||||
const {
|
const {
|
||||||
isValid,
|
isValid,
|
||||||
errors: newErrors
|
errors: newErrors,
|
||||||
} = this.validate()
|
} = this.validate()
|
||||||
|
|
||||||
const nextErrors = Object.assign({}, previousErrors, {
|
const nextErrors = Object.assign({}, previousErrors, {
|
||||||
[field]: newErrors[field] || null
|
[field]: newErrors[field] || null,
|
||||||
})
|
})
|
||||||
|
|
||||||
if (!isValid) {
|
if (!isValid) {
|
||||||
@ -166,7 +166,7 @@ SendTokenScreen.prototype.setErrorsFor = function (field) {
|
|||||||
SendTokenScreen.prototype.clearErrorsFor = function (field) {
|
SendTokenScreen.prototype.clearErrorsFor = function (field) {
|
||||||
const { errors: previousErrors } = this.state
|
const { errors: previousErrors } = this.state
|
||||||
const nextErrors = Object.assign({}, previousErrors, {
|
const nextErrors = Object.assign({}, previousErrors, {
|
||||||
[field]: null
|
[field]: null,
|
||||||
})
|
})
|
||||||
|
|
||||||
this.setState({
|
this.setState({
|
||||||
|
@ -71,7 +71,7 @@ CurrencyDisplay.prototype.render = function () {
|
|||||||
conversionRate,
|
conversionRate,
|
||||||
})
|
})
|
||||||
|
|
||||||
const inputSizeMultiplier = readOnly ? 1 : 1.2;
|
const inputSizeMultiplier = readOnly ? 1 : 1.2
|
||||||
|
|
||||||
return h('div', {
|
return h('div', {
|
||||||
className,
|
className,
|
||||||
@ -95,15 +95,13 @@ CurrencyDisplay.prototype.render = function () {
|
|||||||
|
|
||||||
if (newValue === '') {
|
if (newValue === '') {
|
||||||
newValue = '0'
|
newValue = '0'
|
||||||
}
|
} else if (newValue.match(/^0[1-9]$/)) {
|
||||||
else if (newValue.match(/^0[1-9]$/)) {
|
|
||||||
newValue = newValue.match(/[1-9]/)[0]
|
newValue = newValue.match(/[1-9]/)[0]
|
||||||
}
|
}
|
||||||
|
|
||||||
if (newValue && !isValidInput(newValue)) {
|
if (newValue && !isValidInput(newValue)) {
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
validate(this.getAmount(newValue))
|
validate(this.getAmount(newValue))
|
||||||
this.setState({ value: newValue })
|
this.setState({ value: newValue })
|
||||||
}
|
}
|
||||||
|
@ -30,8 +30,8 @@ EthFeeDisplay.prototype.render = function () {
|
|||||||
color: '#5d5d5d',
|
color: '#5d5d5d',
|
||||||
fontSize: '16px',
|
fontSize: '16px',
|
||||||
fontFamily: 'DIN OT',
|
fontFamily: 'DIN OT',
|
||||||
lineHeight: '22.4px'
|
lineHeight: '22.4px',
|
||||||
}
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ FromDropdown.prototype.renderDropdown = function () {
|
|||||||
closeDropdown()
|
closeDropdown()
|
||||||
},
|
},
|
||||||
icon: this.getListItemIcon(account, selectedAccount),
|
icon: this.getListItemIcon(account, selectedAccount),
|
||||||
}))
|
})),
|
||||||
|
|
||||||
]),
|
]),
|
||||||
|
|
||||||
@ -60,7 +60,7 @@ FromDropdown.prototype.render = function () {
|
|||||||
h(AccountListItem, {
|
h(AccountListItem, {
|
||||||
account: selectedAccount,
|
account: selectedAccount,
|
||||||
handleClick: openDropdown,
|
handleClick: openDropdown,
|
||||||
icon: h(`i.fa.fa-caret-down.fa-lg`, { style: { color: '#dedede' } })
|
icon: h(`i.fa.fa-caret-down.fa-lg`, { style: { color: '#dedede' } }),
|
||||||
}),
|
}),
|
||||||
|
|
||||||
dropdownOpen && this.renderDropdown(),
|
dropdownOpen && this.renderDropdown(),
|
||||||
|
@ -30,14 +30,13 @@ GasFeeDisplay.prototype.render = function () {
|
|||||||
convertedPrefix: '$',
|
convertedPrefix: '$',
|
||||||
readOnly: true,
|
readOnly: true,
|
||||||
})
|
})
|
||||||
: h('div.currency-display', 'Loading...')
|
: h('div.currency-display', 'Loading...'),
|
||||||
,
|
|
||||||
|
|
||||||
h('div.send-v2__sliders-icon-container', {
|
h('div.send-v2__sliders-icon-container', {
|
||||||
onClick,
|
onClick,
|
||||||
}, [
|
}, [
|
||||||
h('i.fa.fa-sliders.send-v2__sliders-icon'),
|
h('i.fa.fa-sliders.send-v2__sliders-icon'),
|
||||||
])
|
]),
|
||||||
|
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
const { addCurrencies, conversionGreaterThan } = require('../../conversion-util')
|
const { addCurrencies, conversionGreaterThan } = require('../../conversion-util')
|
||||||
|
|
||||||
function isBalanceSufficient({
|
function isBalanceSufficient ({
|
||||||
amount,
|
amount,
|
||||||
gasTotal,
|
gasTotal,
|
||||||
balance,
|
balance,
|
||||||
|
@ -23,9 +23,9 @@ function mapStateToProps (state) {
|
|||||||
const selectedToken = getSelectedToken(state)
|
const selectedToken = getSelectedToken(state)
|
||||||
const conversionRate = conversionRateSelector(state)
|
const conversionRate = conversionRateSelector(state)
|
||||||
|
|
||||||
let data;
|
let data
|
||||||
let primaryCurrency;
|
let primaryCurrency
|
||||||
let tokenToFiatRate;
|
let tokenToFiatRate
|
||||||
if (selectedToken) {
|
if (selectedToken) {
|
||||||
data = Array.prototype.map.call(
|
data = Array.prototype.map.call(
|
||||||
abi.rawEncode(['address', 'uint256'], [selectedAddress, '0x0']),
|
abi.rawEncode(['address', 'uint256'], [selectedAddress, '0x0']),
|
||||||
@ -70,6 +70,6 @@ function mapDispatchToProps (dispatch) {
|
|||||||
updateSendMemo: newMemo => dispatch(actions.updateSendMemo(newMemo)),
|
updateSendMemo: newMemo => dispatch(actions.updateSendMemo(newMemo)),
|
||||||
updateSendErrors: newError => dispatch(actions.updateSendErrors(newError)),
|
updateSendErrors: newError => dispatch(actions.updateSendErrors(newError)),
|
||||||
goHome: () => dispatch(actions.goHome()),
|
goHome: () => dispatch(actions.goHome()),
|
||||||
clearSend: () => dispatch(actions.clearSend())
|
clearSend: () => dispatch(actions.clearSend()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -45,7 +45,7 @@ ToAutoComplete.prototype.renderDropdown = function () {
|
|||||||
icon: this.getListItemIcon(account.address, to),
|
icon: this.getListItemIcon(account.address, to),
|
||||||
displayBalance: false,
|
displayBalance: false,
|
||||||
displayAddress: true,
|
displayAddress: true,
|
||||||
}))
|
})),
|
||||||
|
|
||||||
]),
|
]),
|
||||||
|
|
||||||
@ -67,8 +67,7 @@ ToAutoComplete.prototype.handleInputEvent = function (event = {}, cb) {
|
|||||||
this.setState({ accountsToRender: [] })
|
this.setState({ accountsToRender: [] })
|
||||||
event.target && event.target.select()
|
event.target && event.target.select()
|
||||||
closeDropdown()
|
closeDropdown()
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
this.setState({ accountsToRender: matchingAccounts })
|
this.setState({ accountsToRender: matchingAccounts })
|
||||||
openDropdown()
|
openDropdown()
|
||||||
}
|
}
|
||||||
@ -99,7 +98,7 @@ ToAutoComplete.prototype.render = function () {
|
|||||||
onFocus: event => this.handleInputEvent(event),
|
onFocus: event => this.handleInputEvent(event),
|
||||||
style: {
|
style: {
|
||||||
borderColor: inError ? 'red' : null,
|
borderColor: inError ? 'red' : null,
|
||||||
}
|
},
|
||||||
}),
|
}),
|
||||||
|
|
||||||
!to && h(`i.fa.fa-caret-down.fa-lg.send-v2__to-autocomplete__down-caret`, {
|
!to && h(`i.fa.fa-caret-down.fa-lg.send-v2__to-autocomplete__down-caret`, {
|
||||||
|
@ -28,8 +28,8 @@ USDFeeDisplay.prototype.render = function () {
|
|||||||
color: '#5d5d5d',
|
color: '#5d5d5d',
|
||||||
fontSize: '16px',
|
fontSize: '16px',
|
||||||
fontFamily: 'DIN OT',
|
fontFamily: 'DIN OT',
|
||||||
lineHeight: '22.4px'
|
lineHeight: '22.4px',
|
||||||
}
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,13 +27,13 @@ function mapStateToProps (state) {
|
|||||||
requester: null,
|
requester: null,
|
||||||
requesterAddress: null,
|
requesterAddress: null,
|
||||||
accounts: accountsWithSendEtherInfoSelector(state),
|
accounts: accountsWithSendEtherInfoSelector(state),
|
||||||
conversionRate: conversionRateSelector(state)
|
conversionRate: conversionRateSelector(state),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function mapDispatchToProps (dispatch) {
|
function mapDispatchToProps (dispatch) {
|
||||||
return {
|
return {
|
||||||
goHome: () => dispatch(actions.goHome())
|
goHome: () => dispatch(actions.goHome()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -84,7 +84,7 @@ SignatureRequest.prototype.renderAccountDropdown = function () {
|
|||||||
dropdownOpen: accountDropdownOpen,
|
dropdownOpen: accountDropdownOpen,
|
||||||
openDropdown: () => this.setState({ accountDropdownOpen: true }),
|
openDropdown: () => this.setState({ accountDropdownOpen: true }),
|
||||||
closeDropdown: () => this.setState({ accountDropdownOpen: false }),
|
closeDropdown: () => this.setState({ accountDropdownOpen: false }),
|
||||||
})
|
}),
|
||||||
|
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
@ -128,7 +128,7 @@ SignatureRequest.prototype.renderRequestIcon = function () {
|
|||||||
h(Identicon, {
|
h(Identicon, {
|
||||||
diameter: 40,
|
diameter: 40,
|
||||||
address: requesterAddress,
|
address: requesterAddress,
|
||||||
})
|
}),
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -137,7 +137,7 @@ SignatureRequest.prototype.renderRequestInfo = function () {
|
|||||||
|
|
||||||
h('div.request-signature__headline', [
|
h('div.request-signature__headline', [
|
||||||
`Your signature is being requested`,
|
`Your signature is being requested`,
|
||||||
])
|
]),
|
||||||
|
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
@ -161,11 +161,9 @@ SignatureRequest.prototype.renderBody = function () {
|
|||||||
|
|
||||||
if (type === 'personal_sign') {
|
if (type === 'personal_sign') {
|
||||||
rows = [{ name: 'Message', value: this.msgHexToText(data) }]
|
rows = [{ name: 'Message', value: this.msgHexToText(data) }]
|
||||||
}
|
} else if (type === 'eth_signTypedData') {
|
||||||
else if (type === 'eth_signTypedData') {
|
|
||||||
rows = data
|
rows = data
|
||||||
}
|
} else if (type === 'eth_sign') {
|
||||||
else if (type === 'eth_sign') {
|
|
||||||
rows = [{ name: 'Message', value: data }]
|
rows = [{ name: 'Message', value: data }]
|
||||||
notice = `Signing this message can have
|
notice = `Signing this message can have
|
||||||
dangerous side effects. Only sign messages from
|
dangerous side effects. Only sign messages from
|
||||||
@ -183,7 +181,7 @@ SignatureRequest.prototype.renderBody = function () {
|
|||||||
className: classnames({
|
className: classnames({
|
||||||
'request-signature__notice': type === 'personal_sign' || type === 'eth_signTypedData',
|
'request-signature__notice': type === 'personal_sign' || type === 'eth_signTypedData',
|
||||||
'request-signature__warning': type === 'eth_sign',
|
'request-signature__warning': type === 'eth_sign',
|
||||||
})
|
}),
|
||||||
}, [notice]),
|
}, [notice]),
|
||||||
|
|
||||||
h('div.request-signature__rows', [
|
h('div.request-signature__rows', [
|
||||||
@ -218,12 +216,10 @@ SignatureRequest.prototype.renderFooter = function () {
|
|||||||
if (type === 'personal_sign') {
|
if (type === 'personal_sign') {
|
||||||
cancel = cancelPersonalMessage
|
cancel = cancelPersonalMessage
|
||||||
sign = signPersonalMessage
|
sign = signPersonalMessage
|
||||||
}
|
} else if (type === 'eth_signTypedData') {
|
||||||
else if (type === 'eth_signTypedData') {
|
|
||||||
cancel = cancelTypedMessage
|
cancel = cancelTypedMessage
|
||||||
sign = signTypedMessage
|
sign = signTypedMessage
|
||||||
}
|
} else if (type === 'eth_sign') {
|
||||||
else if (type === 'eth_sign') {
|
|
||||||
cancel = cancelMessage
|
cancel = cancelMessage
|
||||||
sign = signMessage
|
sign = signMessage
|
||||||
}
|
}
|
||||||
|
@ -68,10 +68,10 @@ TokenCell.prototype.render = function () {
|
|||||||
// userAddress,
|
// userAddress,
|
||||||
} = props
|
} = props
|
||||||
|
|
||||||
const pair = `${symbol.toLowerCase()}_eth`;
|
const pair = `${symbol.toLowerCase()}_eth`
|
||||||
|
|
||||||
let currentTokenToFiatRate;
|
let currentTokenToFiatRate
|
||||||
let currentTokenInFiat;
|
let currentTokenInFiat
|
||||||
let formattedFiat = ''
|
let formattedFiat = ''
|
||||||
|
|
||||||
if (tokenExchangeRates[pair]) {
|
if (tokenExchangeRates[pair]) {
|
||||||
@ -86,7 +86,7 @@ TokenCell.prototype.render = function () {
|
|||||||
numberOfDecimals: 2,
|
numberOfDecimals: 2,
|
||||||
conversionRate: currentTokenToFiatRate,
|
conversionRate: currentTokenToFiatRate,
|
||||||
})
|
})
|
||||||
formattedFiat = `${currentTokenInFiat} ${currentCurrency.toUpperCase()}`;
|
formattedFiat = `${currentTokenInFiat} ${currentCurrency.toUpperCase()}`
|
||||||
}
|
}
|
||||||
|
|
||||||
const showFiat = Boolean(currentTokenInFiat) && currentCurrency.toUpperCase() !== symbol
|
const showFiat = Boolean(currentTokenInFiat) && currentCurrency.toUpperCase() !== symbol
|
||||||
|
@ -138,7 +138,7 @@ TxListItem.prototype.getSendTokenTotal = async function () {
|
|||||||
const multiplier = Math.pow(10, Number(decimals || 0))
|
const multiplier = Math.pow(10, Number(decimals || 0))
|
||||||
const total = Number(value / multiplier)
|
const total = Number(value / multiplier)
|
||||||
|
|
||||||
const pair = symbol && `${symbol.toLowerCase()}_eth`;
|
const pair = symbol && `${symbol.toLowerCase()}_eth`
|
||||||
|
|
||||||
let tokenToFiatRate
|
let tokenToFiatRate
|
||||||
let totalInFiat
|
let totalInFiat
|
||||||
@ -242,6 +242,6 @@ TxListItem.prototype.render = function () {
|
|||||||
|
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
]) // holding on icon from design
|
]), // holding on icon from design
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ function mapStateToProps (state) {
|
|||||||
|
|
||||||
function mapDispatchToProps (dispatch) {
|
function mapDispatchToProps (dispatch) {
|
||||||
return {
|
return {
|
||||||
showConfTxPage: ({ id }) => dispatch(showConfTxPage({ id }))
|
showConfTxPage: ({ id }) => dispatch(showConfTxPage({ id })),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -103,7 +103,7 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa
|
|||||||
tokenInfoGetter: this.tokenInfoGetter,
|
tokenInfoGetter: this.tokenInfoGetter,
|
||||||
}
|
}
|
||||||
|
|
||||||
const isUnapproved = transactionStatus === 'unapproved';
|
const isUnapproved = transactionStatus === 'unapproved'
|
||||||
|
|
||||||
if (isUnapproved) {
|
if (isUnapproved) {
|
||||||
opts.onClick = () => showConfTxPage({id: transActionId})
|
opts.onClick = () => showConfTxPage({id: transActionId})
|
||||||
|
@ -106,7 +106,7 @@ const converter = R.pipe(
|
|||||||
whenPredSetWithPropAndSetter(R.prop('numberOfDecimals'), 'numberOfDecimals', round),
|
whenPredSetWithPropAndSetter(R.prop('numberOfDecimals'), 'numberOfDecimals', round),
|
||||||
whenPropApplySetterMap('toNumericBase', baseChange),
|
whenPropApplySetterMap('toNumericBase', baseChange),
|
||||||
R.view(R.lensProp('value'))
|
R.view(R.lensProp('value'))
|
||||||
);
|
)
|
||||||
|
|
||||||
const conversionUtil = (value, {
|
const conversionUtil = (value, {
|
||||||
fromCurrency = null,
|
fromCurrency = null,
|
||||||
@ -129,7 +129,7 @@ const conversionUtil = (value, {
|
|||||||
conversionRate,
|
conversionRate,
|
||||||
invertConversionRate,
|
invertConversionRate,
|
||||||
value: value || '0',
|
value: value || '0',
|
||||||
});
|
})
|
||||||
|
|
||||||
const addCurrencies = (a, b, options = {}) => {
|
const addCurrencies = (a, b, options = {}) => {
|
||||||
const {
|
const {
|
||||||
@ -137,7 +137,7 @@ const addCurrencies = (a, b, options = {}) => {
|
|||||||
bBase,
|
bBase,
|
||||||
...conversionOptions
|
...conversionOptions
|
||||||
} = options
|
} = options
|
||||||
const value = (new BigNumber(a, aBase)).add(b, bBase);
|
const value = (new BigNumber(a, aBase)).add(b, bBase)
|
||||||
|
|
||||||
return converter({
|
return converter({
|
||||||
value,
|
value,
|
||||||
@ -155,17 +155,17 @@ const multiplyCurrencies = (a, b, options = {}) => {
|
|||||||
const bigNumberA = new BigNumber(String(a), multiplicandBase)
|
const bigNumberA = new BigNumber(String(a), multiplicandBase)
|
||||||
const bigNumberB = new BigNumber(String(b), multiplierBase)
|
const bigNumberB = new BigNumber(String(b), multiplierBase)
|
||||||
|
|
||||||
const value = bigNumberA.times(bigNumberB);
|
const value = bigNumberA.times(bigNumberB)
|
||||||
|
|
||||||
return converter({
|
return converter({
|
||||||
value,
|
value,
|
||||||
...conversionOptions
|
...conversionOptions,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
const conversionGreaterThan = (
|
const conversionGreaterThan = (
|
||||||
{ ...firstProps },
|
{ ...firstProps },
|
||||||
{ ...secondProps },
|
{ ...secondProps },
|
||||||
) => {
|
) => {
|
||||||
const firstValue = converter({ ...firstProps })
|
const firstValue = converter({ ...firstProps })
|
||||||
const secondValue = converter({ ...secondProps })
|
const secondValue = converter({ ...secondProps })
|
||||||
@ -174,7 +174,7 @@ const conversionGreaterThan = (
|
|||||||
|
|
||||||
const conversionGTE = (
|
const conversionGTE = (
|
||||||
{ ...firstProps },
|
{ ...firstProps },
|
||||||
{ ...secondProps },
|
{ ...secondProps },
|
||||||
) => {
|
) => {
|
||||||
const firstValue = converter({ ...firstProps })
|
const firstValue = converter({ ...firstProps })
|
||||||
const secondValue = converter({ ...secondProps })
|
const secondValue = converter({ ...secondProps })
|
||||||
@ -183,7 +183,7 @@ const conversionGTE = (
|
|||||||
|
|
||||||
const conversionLTE = (
|
const conversionLTE = (
|
||||||
{ ...firstProps },
|
{ ...firstProps },
|
||||||
{ ...secondProps },
|
{ ...secondProps },
|
||||||
) => {
|
) => {
|
||||||
const firstValue = converter({ ...firstProps })
|
const firstValue = converter({ ...firstProps })
|
||||||
const secondValue = converter({ ...secondProps })
|
const secondValue = converter({ ...secondProps })
|
||||||
|
@ -44,7 +44,7 @@ function reduceApp (state, action) {
|
|||||||
},
|
},
|
||||||
previousModalState: {
|
previousModalState: {
|
||||||
name: null,
|
name: null,
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
sidebarOpen: false,
|
sidebarOpen: false,
|
||||||
networkDropdownOpen: false,
|
networkDropdownOpen: false,
|
||||||
|
@ -235,7 +235,7 @@ function reduceMetamask (state, action) {
|
|||||||
errors: {
|
errors: {
|
||||||
...metamaskState.send.errors,
|
...metamaskState.send.errors,
|
||||||
...action.value,
|
...action.value,
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -94,7 +94,7 @@ SendTransactionScreen.prototype.renderHeaderIcon = function () {
|
|||||||
diameter: 40,
|
diameter: 40,
|
||||||
address: selectedToken.address,
|
address: selectedToken.address,
|
||||||
})
|
})
|
||||||
: h('img.send-v2__send-header-icon', { src: '../images/eth_logo.svg' })
|
: h('img.send-v2__send-header-icon', { src: '../images/eth_logo.svg' }),
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -135,12 +135,12 @@ SendTransactionScreen.prototype.renderHeader = function () {
|
|||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
SendTransactionScreen.prototype.renderErrorMessage = function(errorType) {
|
SendTransactionScreen.prototype.renderErrorMessage = function (errorType) {
|
||||||
const { errors } = this.props
|
const { errors } = this.props
|
||||||
const errorMessage = errors[errorType];
|
const errorMessage = errors[errorType]
|
||||||
|
|
||||||
return errorMessage
|
return errorMessage
|
||||||
? h('div.send-v2__error', [ errorMessage ] )
|
? h('div.send-v2__error', [ errorMessage ])
|
||||||
: null
|
: null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user