More lint fixes

feature/default_network_editable
Dan 7 years ago
parent 5a94775b3f
commit 56e9f98bd0
  1. 1
      package.json
  2. 12
      ui/app/actions.js
  3. 2
      ui/app/app.js
  4. 6
      ui/app/components/customize-gas-modal/gas-modal-card.js
  5. 4
      ui/app/components/customize-gas-modal/gas-slider.js
  6. 16
      ui/app/components/customize-gas-modal/index.js
  7. 10
      ui/app/components/dropdowns/account-dropdown-mini.js
  8. 6
      ui/app/components/dropdowns/token-menu-dropdown.js
  9. 2
      ui/app/components/modals/modal.js
  10. 2
      ui/app/components/modals/shapeshift-deposit-tx-modal.js
  11. 2
      ui/app/components/network.js
  12. 2
      ui/app/components/pending-tx/confirm-send-token.js
  13. 8
      ui/app/components/send-token/index.js
  14. 2
      ui/app/components/send/account-list-item.js
  15. 10
      ui/app/components/send/currency-display.js
  16. 4
      ui/app/components/send/eth-fee-display.js
  17. 10
      ui/app/components/send/from-dropdown.js
  18. 5
      ui/app/components/send/gas-fee-display-v2.js
  19. 2
      ui/app/components/send/memo-textarea.js
  20. 4
      ui/app/components/send/send-utils.js
  21. 8
      ui/app/components/send/send-v2-container.js
  22. 13
      ui/app/components/send/to-autocomplete.js
  23. 4
      ui/app/components/send/usd-fee-display.js
  24. 28
      ui/app/components/signature-request.js
  25. 12
      ui/app/components/token-cell.js
  26. 6
      ui/app/components/tx-list-item.js
  27. 4
      ui/app/components/tx-list.js
  28. 2
      ui/app/conf-tx.js
  29. 18
      ui/app/conversion-util.js
  30. 4
      ui/app/reducers/app.js
  31. 2
      ui/app/reducers/metamask.js
  32. 8
      ui/app/send-v2.js
  33. 4
      ui/app/send.js

@ -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,
} }

@ -145,7 +145,7 @@ App.prototype.render = function () {
(isLoading || isLoadingNetwork) && h(Loading, { (isLoading || isLoadingNetwork) && h(Loading, {
loadingMessage: loadMessage, loadingMessage: loadMessage,
}), }),
// this.renderLoadingIndicator({ isLoading, isLoadingNetwork, loadMessage }), // this.renderLoadingIndicator({ isLoading, isLoadingNetwork, loadMessage }),
// content // content

@ -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', [
@ -47,8 +47,8 @@ GasModalCard.prototype.render = function () {
// min, // min,
// onChange, // onChange,
// }), // }),
]) ])
} }

@ -43,8 +43,8 @@
// h('div.gas-slider__high'), // h('div.gas-slider__high'),
// ]), // ]),
// ]) // ])
// } // }

@ -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)
@ -126,9 +126,9 @@ CustomizeGasModal.prototype.validate = function ({ gasTotal, gasLimit }) {
}) })
if (!balanceIsSufficient) { if (!balanceIsSufficient) {
error = 'Insufficient balance for current gas total' error = 'Insufficient balance for current gas total'
} }
const gasLimitTooLow = gasLimit && conversionGreaterThan( const gasLimitTooLow = gasLimit && conversionGreaterThan(
{ {
value: MIN_GAS_LIMIT_DEC, value: MIN_GAS_LIMIT_DEC,
@ -142,7 +142,7 @@ CustomizeGasModal.prototype.validate = function ({ gasTotal, gasLimit }) {
) )
if (gasLimitTooLow) { if (gasLimitTooLow) {
error = 'Gas limit must be at least 21000' error = 'Gas limit must be at least 21000'
} }
this.setState({ error }) this.setState({ error })
@ -219,7 +219,7 @@ CustomizeGasModal.prototype.render = function () {
]), ]),
h('div.send-v2__customize-gas__body', {}, [ h('div.send-v2__customize-gas__body', {}, [
h(GasModalCard, { h(GasModalCard, {
value: convertedGasPrice, value: convertedGasPrice,
min: MIN_GAS_PRICE_GWEI, min: MIN_GAS_PRICE_GWEI,
@ -247,7 +247,7 @@ CustomizeGasModal.prototype.render = function () {
error && h('div.send-v2__customize-gas__error-message', [ error && h('div.send-v2__customize-gas__error-message', [
error, error,
]), ]),
h('div.send-v2__customize-gas__revert', { h('div.send-v2__customize-gas__revert', {
onClick: () => this.revert(), onClick: () => this.revert(),
}, ['Revert']), }, ['Revert']),
@ -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']),
]) ]),
]), ]),

@ -37,13 +37,13 @@ AccountDropdownMini.prototype.renderDropdown = function () {
...accounts.map(account => h(AccountListItem, { ...accounts.map(account => h(AccountListItem, {
account, account,
displayBalance: false, displayBalance: false,
displayAddress: false, displayAddress: false,
handleClick: () => { handleClick: () => {
onSelect(account) onSelect(account)
closeDropdown() closeDropdown()
}, },
icon: this.getListItemIcon(account, selectedAccount), icon: this.getListItemIcon(account, selectedAccount),
})) })),
]), ]),
@ -64,12 +64,12 @@ 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 }))
} },
} }
} }
@ -36,14 +36,14 @@ TokenMenuDropdown.prototype.render = function () {
}), }),
h('div.token-menu-dropdown__container', {}, [ h('div.token-menu-dropdown__container', {}, [
h('div.token-menu-dropdown__options', {}, [ h('div.token-menu-dropdown__options', {}, [
h('div.token-menu-dropdown__option', { h('div.token-menu-dropdown__option', {
onClick: (e) => { onClick: (e) => {
e.stopPropagation() e.stopPropagation()
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')

@ -144,7 +144,7 @@ ConfirmSendToken.prototype.getData = function () {
const { value } = params[0] || {} const { value } = params[0] || {}
const txMeta = this.gatherTxMeta() const txMeta = this.gatherTxMeta()
const txParams = txMeta.txParams || {} const txParams = txMeta.txParams || {}
return { return {
from: { from: {
address: txParams.from, address: txParams.from,

@ -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({
@ -428,7 +428,7 @@ SendTokenScreen.prototype.render = function () {
this.renderAmountInput(), this.renderAmountInput(),
this.renderGasInput(), this.renderGasInput(),
this.renderMemoInput(), this.renderMemoInput(),
warning && h('div.send-screen-input-wrapper--error', {}, warning && h('div.send-screen-input-wrapper--error', {},
h('div.send-screen-input-wrapper__error-message', [ h('div.send-screen-input-wrapper__error-message', [
warning, warning,
]) ])

@ -68,4 +68,4 @@ AccountListItem.prototype.render = function () {
}, name), }, name),
]) ])
} }

@ -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 })
} }
@ -122,6 +120,6 @@ CurrencyDisplay.prototype.render = function () {
}, `${convertedValue} ${convertedCurrency.toUpperCase()}`), }, `${convertedValue} ${convertedCurrency.toUpperCase()}`),
]) ])
} }

@ -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',
} },
}) })
} }

@ -35,13 +35,13 @@ FromDropdown.prototype.renderDropdown = function () {
h('div.send-v2__from-dropdown__list', {}, [ h('div.send-v2__from-dropdown__list', {}, [
...accounts.map(account => h(AccountListItem, { ...accounts.map(account => h(AccountListItem, {
account, account,
handleClick: () => { handleClick: () => {
onSelect(account) onSelect(account)
closeDropdown() closeDropdown()
}, },
icon: this.getListItemIcon(account, selectedAccount), icon: this.getListItemIcon(account, selectedAccount),
})) })),
]), ]),
@ -60,12 +60,12 @@ 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'),
]) ]),
]) ])
} }

@ -28,6 +28,6 @@
// }), // }),
// ]) // ])
// } // }

@ -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,
@ -35,4 +35,4 @@ function isBalanceSufficient({
module.exports = { module.exports = {
isBalanceSufficient, isBalanceSufficient,
} }

@ -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()),
} }
} }

@ -37,15 +37,15 @@ ToAutoComplete.prototype.renderDropdown = function () {
h('div.send-v2__from-dropdown__list', {}, [ h('div.send-v2__from-dropdown__list', {}, [
...accountsToRender.map(account => h(AccountListItem, { ...accountsToRender.map(account => h(AccountListItem, {
account, account,
handleClick: () => { handleClick: () => {
onChange(account.address) onChange(account.address)
closeDropdown() closeDropdown()
}, },
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()
} }
@ -93,13 +92,13 @@ ToAutoComplete.prototype.render = function () {
h('input.send-v2__to-autocomplete__input', { h('input.send-v2__to-autocomplete__input', {
placeholder: 'Recipient Address', placeholder: 'Recipient Address',
className: inError ? `send-v2__error-border` : '', className: inError ? `send-v2__error-border` : '',
value: to, value: to,
onChange: event => onChange(event.target.value), onChange: event => onChange(event.target.value),
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 }),
}) }),
]) ])
} }
@ -113,7 +113,7 @@ SignatureRequest.prototype.renderAccountInfo = function () {
return h('div.request-signature__account-info', [ return h('div.request-signature__account-info', [
this.renderAccountDropdown(), this.renderAccountDropdown(),
this.renderRequestIcon(), this.renderRequestIcon(),
this.renderBalance(), this.renderBalance(),
@ -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,14 +181,14 @@ 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', [
...rows.map(({ name, value }) => { ...rows.map(({ name, value }) => {
return h('div.request-signature__row', [ return h('div.request-signature__row', [
h('div.request-signature__row-title', [`${name}:`]), h('div.request-signature__row-title', [`${name}:`]),
h('div.request-signature__row-value', value), h('div.request-signature__row-value', value),
]) ])
}), }),
@ -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
} }

@ -67,11 +67,11 @@ TokenCell.prototype.render = function () {
currentCurrency, currentCurrency,
// userAddress, // userAddress,
} = props } = props
const pair = `${symbol.toLowerCase()}_eth`;
let currentTokenToFiatRate; const pair = `${symbol.toLowerCase()}_eth`
let currentTokenInFiat;
let currentTokenToFiatRate
let currentTokenInFiat
let formattedFiat = '' let formattedFiat = ''
if (tokenExchangeRates[pair]) { if (tokenExchangeRates[pair]) {
@ -86,11 +86,11 @@ 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
return ( return (
h('div.token-list-item', { h('div.token-list-item', {
className: `token-list-item ${selectedTokenAddress === address ? 'token-list-item--active' : ''}`, className: `token-list-item ${selectedTokenAddress === address ? 'token-list-item--active' : ''}`,

@ -138,8 +138,8 @@ 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})

@ -121,7 +121,7 @@ function currentTxView (opts) {
return h(PendingTx, opts) return h(PendingTx, opts)
} else if (msgParams) { } else if (msgParams) {
log.debug('msgParams detected, rendering pending msg') log.debug('msgParams detected, rendering pending msg')
return h(SignatureRequest, opts) return h(SignatureRequest, opts)
// if (type === 'eth_sign') { // if (type === 'eth_sign') {

@ -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 })
@ -202,4 +202,4 @@ module.exports = {
conversionGTE, conversionGTE,
conversionLTE, conversionLTE,
toNegative, toNegative,
} }

@ -44,7 +44,7 @@ function reduceApp (state, action) {
}, },
previousModalState: { previousModalState: {
name: null, name: null,
} },
}, },
sidebarOpen: false, sidebarOpen: false,
networkDropdownOpen: false, networkDropdownOpen: false,
@ -100,7 +100,7 @@ function reduceApp (state, action) {
state.appState.modal, state.appState.modal,
{ open: false }, { open: false },
{ modalState: { name: null } }, { modalState: { name: null } },
{ previousModalState: appState.modal.modalState}, { previousModalState: appState.modal.modalState},
), ),
}) })

@ -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
} }

@ -69,11 +69,11 @@
// amountToSend: '0x0', // amountToSend: '0x0',
// gasPrice: null, // gasPrice: null,
// gas: null, // gas: null,
// amount: '0x0', // amount: '0x0',
// txData: null, // txData: null,
// memo: '', // memo: '',
// }, // },
// activeCurrency: 'USD', // activeCurrency: 'USD',
// tooltipIsOpen: false, // tooltipIsOpen: false,
// errors: {}, // errors: {},
// isValid: false, // isValid: false,

Loading…
Cancel
Save