aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/send_/send-content
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2018-04-27 08:38:14 +0800
committerDan <danjm.com@gmail.com>2018-04-27 10:46:11 +0800
commit91c201aa72581a59a0d2ef73a225b1768584dea7 (patch)
tree00782275e57c568fff16e289002a6c3a91f3c81e /ui/app/components/send_/send-content
parent8ff7806f1b471a90fa3f45ebc10f0f4452ade541 (diff)
downloadtangerine-wallet-browser-91c201aa72581a59a0d2ef73a225b1768584dea7.tar.gz
tangerine-wallet-browser-91c201aa72581a59a0d2ef73a225b1768584dea7.tar.zst
tangerine-wallet-browser-91c201aa72581a59a0d2ef73a225b1768584dea7.zip
Lint fixes and alphabetization for i3725-refactor-send-component
Diffstat (limited to 'ui/app/components/send_/send-content')
-rw-r--r--ui/app/components/send_/send-content/send-amount-row/amount-max-button/amount-max-button.component.js20
-rw-r--r--ui/app/components/send_/send-content/send-amount-row/amount-max-button/amount-max-button.container.js17
-rw-r--r--ui/app/components/send_/send-content/send-amount-row/amount-max-button/amount-max-button.utils.js2
-rw-r--r--ui/app/components/send_/send-content/send-amount-row/send-amount-row.component.js21
-rw-r--r--ui/app/components/send_/send-content/send-amount-row/send-amount-row.container.js37
-rw-r--r--ui/app/components/send_/send-content/send-amount-row/send-amount-row.selectors.js6
-rw-r--r--ui/app/components/send_/send-content/send-amount-row/send-amount-row.utils.js21
-rw-r--r--ui/app/components/send_/send-content/send-content.component.js9
-rw-r--r--ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js20
-rw-r--r--ui/app/components/send_/send-content/send-from-row/send-from-row.component.js17
-rw-r--r--ui/app/components/send_/send-content/send-from-row/send-from-row.container.js15
-rw-r--r--ui/app/components/send_/send-content/send-from-row/send-from-row.utils.js2
-rw-r--r--ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js17
-rw-r--r--ui/app/components/send_/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.component.js6
-rw-r--r--ui/app/components/send_/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.container.js2
-rw-r--r--ui/app/components/send_/send-content/send-row-wrapper/send-row-wrapper.component.js18
-rw-r--r--ui/app/components/send_/send-content/send-to-row/send-to-row.component.js37
-rw-r--r--ui/app/components/send_/send-content/send-to-row/send-to-row.container.js16
-rw-r--r--ui/app/components/send_/send-content/send-to-row/send-to-row.utils.js4
19 files changed, 136 insertions, 151 deletions
diff --git a/ui/app/components/send_/send-content/send-amount-row/amount-max-button/amount-max-button.component.js b/ui/app/components/send_/send-content/send-amount-row/amount-max-button/amount-max-button.component.js
index 6705a332d..c3b5b6ae4 100644
--- a/ui/app/components/send_/send-content/send-amount-row/amount-max-button/amount-max-button.component.js
+++ b/ui/app/components/send_/send-content/send-amount-row/amount-max-button/amount-max-button.component.js
@@ -4,29 +4,29 @@ import PropTypes from 'prop-types'
export default class AmountMaxButton extends Component {
static propTypes = {
- tokenBalance: PropTypes.string,
- gasTotal: PropTypes.string,
balance: PropTypes.string,
+ gasTotal: PropTypes.string,
+ maxModeOn: PropTypes.bool,
selectedToken: PropTypes.object,
setAmountToMax: PropTypes.func,
setMaxModeTo: PropTypes.func,
- maxModeOn: PropTypes.bool,
+ tokenBalance: PropTypes.string,
};
setAmountToMax = function () {
const {
balance,
- tokenBalance,
- selectedToken,
gasTotal,
+ selectedToken,
setAmountToMax,
+ tokenBalance,
} = this.props
setAmountToMax({
- tokenBalance,
- selectedToken,
+ balance,
gasTotal,
- setAmountToMax,
+ selectedToken,
+ tokenBalance,
})
}
@@ -35,7 +35,7 @@ export default class AmountMaxButton extends Component {
return (
<div
- className='send-v2__amount-max'
+ className="send-v2__amount-max"
onClick={(event) => {
event.preventDefault()
setMaxModeTo(true)
@@ -44,7 +44,7 @@ export default class AmountMaxButton extends Component {
>
{!maxModeOn ? this.context.t('max') : ''}
</div>
- );
+ )
}
}
diff --git a/ui/app/components/send_/send-content/send-amount-row/amount-max-button/amount-max-button.container.js b/ui/app/components/send_/send-content/send-amount-row/amount-max-button/amount-max-button.container.js
index 1b694902f..5bdb67995 100644
--- a/ui/app/components/send_/send-content/send-amount-row/amount-max-button/amount-max-button.container.js
+++ b/ui/app/components/send_/send-content/send-amount-row/amount-max-button/amount-max-button.container.js
@@ -1,28 +1,29 @@
import { connect } from 'react-redux'
import {
- getSelectedToken,
getGasTotal,
- getTokenBalance,
+ getSelectedToken,
getSendFromBalance,
+ getTokenBalance,
} from '../../../send.selectors.js'
import { getMaxModeOn } from '../send-amount-row.selectors.js'
import { calcMaxAmount } from './amount-max-button.utils.js'
import {
updateSendAmount,
+ updateSendErrors,
setMaxModeTo,
} from '../../../actions'
import AmountMaxButton from './amount-max-button.component'
-export default connect(mapStateToProps, mapDispatchToProps)(SendToRow)
+export default connect(mapStateToProps, mapDispatchToProps)(AmountMaxButton)
function mapStateToProps (state) {
return {
- selectedToken: getSelectedToken(state),
- maxModeOn: getMaxModeOn(state),
+ balance: getSendFromBalance(state),
gasTotal: getGasTotal(state),
+ maxModeOn: getMaxModeOn(state),
+ selectedToken: getSelectedToken(state),
tokenBalance: getTokenBalance(state),
- balance: getSendFromBalance(state),
}
}
@@ -31,7 +32,7 @@ function mapDispatchToProps (dispatch) {
setAmountToMax: maxAmountDataObject => {
updateSendErrors({ amount: null })
updateSendAmount(calcMaxAmount(maxAmountDataObject))
- }
+ },
setMaxModeTo: bool => dispatch(setMaxModeTo(bool)),
}
-} \ No newline at end of file
+}
diff --git a/ui/app/components/send_/send-content/send-amount-row/amount-max-button/amount-max-button.utils.js b/ui/app/components/send_/send-content/send-amount-row/amount-max-button/amount-max-button.utils.js
index 54aacc8d7..d87f2424b 100644
--- a/ui/app/components/send_/send-content/send-amount-row/amount-max-button/amount-max-button.utils.js
+++ b/ui/app/components/send_/send-content/send-amount-row/amount-max-button/amount-max-button.utils.js
@@ -18,5 +18,5 @@ function calcMaxAmount ({ balance, gasTotal, selectedToken, tokenBalance }) {
}
module.exports = {
- calcMaxAmount
+ calcMaxAmount,
}
diff --git a/ui/app/components/send_/send-content/send-amount-row/send-amount-row.component.js b/ui/app/components/send_/send-content/send-amount-row/send-amount-row.component.js
index 544664dc8..5c3084365 100644
--- a/ui/app/components/send_/send-content/send-amount-row/send-amount-row.component.js
+++ b/ui/app/components/send_/send-content/send-amount-row/send-amount-row.component.js
@@ -7,22 +7,26 @@ import CurrencyDisplay from '../../../send/currency-display'
export default class SendAmountRow extends Component {
static propTypes = {
+ amount: PropTypes.string,
amountConversionRate: PropTypes.number,
+ balance: PropTypes.string,
conversionRate: PropTypes.number,
+ convertedCurrency: PropTypes.string,
gasTotal: PropTypes.string,
+ inError: PropTypes.bool,
primaryCurrency: PropTypes.string,
selectedToken: PropTypes.object,
+ setMaxModeTo: PropTypes.func,
tokenBalance: PropTypes.string,
- updateSendAmountError: PropTypes.func,
updateSendAmount: PropTypes.func,
- setMaxModeTo: PropTypes.func
+ updateSendAmountError: PropTypes.func,
}
validateAmount (amount) {
const {
amountConversionRate,
- conversionRate,
balance,
+ conversionRate,
gasTotal,
primaryCurrency,
selectedToken,
@@ -55,9 +59,8 @@ export default class SendAmountRow extends Component {
amount,
amountConversionRate,
convertedCurrency,
- inError,
gasTotal,
- maxModeOn,
+ inError,
primaryCurrency = 'ETH',
selectedToken,
} = this.props
@@ -70,16 +73,16 @@ export default class SendAmountRow extends Component {
>
{!inError && gasTotal && <AmountMaxButton />}
<CurrencyDisplay
+ conversionRate={amountConversionRate}
+ convertedCurrency={convertedCurrency}
+ handleChange={newAmount => this.handleAmountChange(newAmount)}
inError={inError}
primaryCurrency={primaryCurrency}
- convertedCurrency={convertedCurrency}
selectedToken={selectedToken}
value={amount || '0x0'}
- conversionRate={amountConversionRate}
- handleChange={newAmount => this.handleAmountChange(newAmount)}
/>
</SendRowWrapper>
- );
+ )
}
}
diff --git a/ui/app/components/send_/send-content/send-amount-row/send-amount-row.container.js b/ui/app/components/send_/send-content/send-amount-row/send-amount-row.container.js
index 55df68e69..16e88bede 100644
--- a/ui/app/components/send_/send-content/send-amount-row/send-amount-row.container.js
+++ b/ui/app/components/send_/send-content/send-amount-row/send-amount-row.container.js
@@ -1,24 +1,22 @@
import { connect } from 'react-redux'
import {
- getSelectedToken,
+ getConversionRate,
getConvertedCurrency,
- getSendAmount,
getGasTotal,
- getSelectedBalance,
- getTokenBalance,
+ getSelectedToken,
+ getSendAmount,
getSendFromBalance,
- getConversionRate,
+ getTokenBalance,
} from '../../send.selectors.js'
import {
- getMaxModeOn,
- sendAmountIsInError,
- getPrimaryCurrency,
getAmountConversionRate,
+ getPrimaryCurrency,
+ sendAmountIsInError,
} from './send-amount-row.selectors.js'
import { getAmountErrorObject } from './send-amount-row.utils.js'
import {
- updateSendAmount,
setMaxModeTo,
+ updateSendAmount,
updateSendErrors,
} from '../../../../actions'
import SendAmountRow from './send-amount-row.component'
@@ -27,26 +25,25 @@ export default connect(mapStateToProps, mapDispatchToProps)(SendAmountRow)
function mapStateToProps (state) {
return {
- selectedToken: getSelectedToken(state),
- primaryCurrency: getPrimaryCurrency(state),
- convertedCurrency: getConvertedCurrency(state),
- amountConversionRate: getAmountConversionRate(state),
- inError: sendAmountIsInError(state),
amount: getSendAmount(state),
- maxModeOn: getMaxModeOn(state),
- gasTotal: getGasTotal(state),
- tokenBalance: getTokenBalance(state),
+ amountConversionRate: getAmountConversionRate(state),
balance: getSendFromBalance(state),
conversionRate: getConversionRate(state),
+ convertedCurrency: getConvertedCurrency(state),
+ gasTotal: getGasTotal(state),
+ inError: sendAmountIsInError(state),
+ primaryCurrency: getPrimaryCurrency(state),
+ selectedToken: getSelectedToken(state),
+ tokenBalance: getTokenBalance(state),
}
}
function mapDispatchToProps (dispatch) {
return {
+ setMaxModeTo: bool => dispatch(setMaxModeTo(bool)),
+ updateSendAmount: newAmount => dispatch(updateSendAmount(newAmount)),
updateSendAmountError: (amountDataObject) => {
dispatch(updateSendErrors(getAmountErrorObject(amountDataObject)))
},
- updateSendAmount: newAmount => dispatch(updateSendAmount(newAmount)),
- setMaxModeTo: bool => dispatch(setMaxModeTo(bool)),
}
-} \ No newline at end of file
+}
diff --git a/ui/app/components/send_/send-content/send-amount-row/send-amount-row.selectors.js b/ui/app/components/send_/send-content/send-amount-row/send-amount-row.selectors.js
index c2620b4dc..88dee0dcb 100644
--- a/ui/app/components/send_/send-content/send-amount-row/send-amount-row.selectors.js
+++ b/ui/app/components/send_/send-content/send-amount-row/send-amount-row.selectors.js
@@ -5,10 +5,10 @@ import {
} from '../../send.selectors.js'
const selectors = {
+ getAmountConversionRate,
getMaxModeOn,
- sendAmountIsInError,
getPrimaryCurrency,
- getAmountConversionRate,
+ sendAmountIsInError,
}
module.exports = selectors
@@ -27,7 +27,7 @@ function getPrimaryCurrency (state) {
}
function getAmountConversionRate (state) {
- return Boolean(getSelectedToken(state))
+ return getSelectedToken(state)
? getSelectedTokenToFiatRate(state)
: getConversionRate(state)
}
diff --git a/ui/app/components/send_/send-content/send-amount-row/send-amount-row.utils.js b/ui/app/components/send_/send-content/send-amount-row/send-amount-row.utils.js
index 418b98c18..6ec5463d3 100644
--- a/ui/app/components/send_/send-content/send-amount-row/send-amount-row.utils.js
+++ b/ui/app/components/send_/send-content/send-amount-row/send-amount-row.utils.js
@@ -1,4 +1,3 @@
-const { isValidAddress } = require('../../../../util')
const {
conversionGreaterThan,
} = require('../../../../conversion-util')
@@ -9,31 +8,23 @@ const {
function getAmountErrorObject ({
amount,
- balance,
amountConversionRate,
+ balance,
conversionRate,
+ gasTotal,
primaryCurrency,
selectedToken,
- gasTotal,
tokenBalance,
}) {
- console.log(`#& getAmountErrorObject amount`, amount);
- console.log(`#& getAmountErrorObject balance`, balance);
- console.log(`#& getAmountErrorObject amountConversionRate`, amountConversionRate);
- console.log(`#& getAmountErrorObject conversionRate`, conversionRate);
- console.log(`#& getAmountErrorObject primaryCurrency`, primaryCurrency);
- console.log(`#& getAmountErrorObject selectedToken`, selectedToken);
- console.log(`#& getAmountErrorObject gasTotal`, gasTotal);
- console.log(`#& getAmountErrorObject tokenBalance`, tokenBalance);
let insufficientFunds = false
if (gasTotal && conversionRate) {
insufficientFunds = !isBalanceSufficient({
amount: selectedToken ? '0x0' : amount,
- gasTotal,
- balance,
- primaryCurrency,
amountConversionRate,
+ balance,
conversionRate,
+ gasTotal,
+ primaryCurrency,
})
}
@@ -66,5 +57,5 @@ function getAmountErrorObject ({
}
module.exports = {
- getAmountErrorObject
+ getAmountErrorObject,
}
diff --git a/ui/app/components/send_/send-content/send-content.component.js b/ui/app/components/send_/send-content/send-content.component.js
index 2d1fa52e9..1f5a06fcc 100644
--- a/ui/app/components/send_/send-content/send-content.component.js
+++ b/ui/app/components/send_/send-content/send-content.component.js
@@ -1,24 +1,23 @@
import React, { Component } from 'react'
import PageContainerContent from '../../page-container/page-container-content.component'
-import SendFromRow from './send-from-row/send-from-row.container'
-import SendToRow from './send-to-row/send-to-row.container'
import SendAmountRow from './send-amount-row/send-amount-row.container'
+import SendFromRow from './send-from-row/send-from-row.container'
import SendGasRow from './send-gas-row/send-gas-row.container'
+import SendToRow from './send-to-row/send-to-row.container'
export default class SendContent extends Component {
render () {
- console.log('111222333444555666777888999')
return (
<PageContainerContent>
- <div className='.send-v2__form'>
+ <div className=".send-v2__form">
<SendFromRow />
<SendToRow />
<SendAmountRow />
<SendGasRow />
</div>
</PageContainerContent>
- );
+ )
}
}
diff --git a/ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js b/ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js
index f215179ba..8af8eaf26 100644
--- a/ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js
+++ b/ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js
@@ -26,25 +26,26 @@ export default class FromDropdown extends Component {
renderDropdown () {
const {
accounts,
- selectedAccount,
closeDropdown,
onSelect,
+ selectedAccount,
} = this.props
return (<div>
<div
- className='send-v2__from-dropdown__close-area'
+ className="send-v2__from-dropdown__close-area"
onClick={() => closeDropdown}
/>
- <div className='send-v2__from-dropdown__list'>
- {...accounts.map(account => <AccountListItem
- className='account-list-item__dropdown'
+ <div className="send-v2__from-dropdown__list">
+ {...accounts.map((account, index) => <AccountListItem
account={account}
+ className="account-list-item__dropdown"
handleClick={() => {
onSelect(account)
closeDropdown()
}}
icon={this.getListItemIcon(account, selectedAccount.address)}
+ key={`from-dropdown-account-#${index}`}
/>)}
</div>
</div>)
@@ -52,13 +53,12 @@ export default class FromDropdown extends Component {
render () {
const {
- selectedAccount,
- openDropdown,
dropdownOpen,
+ openDropdown,
+ selectedAccount,
} = this.props
- console.log(`&*& openDropdown`, openDropdown);
- console.log(`&*& dropdownOpen`, dropdownOpen);
- return <div className='send-v2__from-dropdown'>
+
+ return <div className="send-v2__from-dropdown">
<AccountListItem
account={selectedAccount}
handleClick={openDropdown}
diff --git a/ui/app/components/send_/send-content/send-from-row/send-from-row.component.js b/ui/app/components/send_/send-content/send-from-row/send-from-row.component.js
index 0ae72c4ae..193262fa3 100644
--- a/ui/app/components/send_/send-content/send-from-row/send-from-row.component.js
+++ b/ui/app/components/send_/send-content/send-from-row/send-from-row.component.js
@@ -33,28 +33,27 @@ export default class SendFromRow extends Component {
render () {
const {
+ closeFromDropdown,
+ conversionRate,
from,
fromAccounts,
- conversionRate,
fromDropdownOpen,
- tokenContract,
openFromDropdown,
- closeFromDropdown,
} = this.props
- console.log(`$% SendFromRow fromAccounts`, fromAccounts);
+
return (
<SendRowWrapper label={`${this.context.t('from')}:`}>
<FromDropdown
- dropdownOpen={fromDropdownOpen}
accounts={fromAccounts}
- selectedAccount={from}
- onSelect={newFrom => this.handleFromChange(newFrom)}
- openDropdown={() => openFromDropdown()}
closeDropdown={() => closeFromDropdown()}
conversionRate={conversionRate}
+ dropdownOpen={fromDropdownOpen}
+ onSelect={newFrom => this.handleFromChange(newFrom)}
+ openDropdown={() => openFromDropdown()}
+ selectedAccount={from}
/>
</SendRowWrapper>
- );
+ )
}
}
diff --git a/ui/app/components/send_/send-content/send-from-row/send-from-row.container.js b/ui/app/components/send_/send-content/send-from-row/send-from-row.container.js
index e2815a01f..d62782e9f 100644
--- a/ui/app/components/send_/send-content/send-from-row/send-from-row.container.js
+++ b/ui/app/components/send_/send-content/send-from-row/send-from-row.container.js
@@ -1,8 +1,8 @@
import { connect } from 'react-redux'
import {
+ accountsWithSendEtherInfoSelector,
getConversionRate,
getSelectedTokenContract,
- accountsWithSendEtherInfoSelector,
getSendFromObject,
} from '../../send.selectors.js'
import {
@@ -10,23 +10,22 @@ import {
} from './send-from-row.selectors.js'
import { calcTokenUpdateAmount } from './send-from-row.utils.js'
import {
- updateSendTokenBalance,
updateSendFrom,
+ updateSendTokenBalance,
} from '../../../../actions'
import {
- openFromDropdown,
closeFromDropdown,
+ openFromDropdown,
} from '../../../../ducks/send'
import SendFromRow from './send-from-row.component'
export default connect(mapStateToProps, mapDispatchToProps)(SendFromRow)
function mapStateToProps (state) {
- console.log(`$% mapStateToProps accountsWithSendEtherInfoSelector`, accountsWithSendEtherInfoSelector);
return {
+ conversionRate: getConversionRate(state),
from: getSendFromObject(state),
fromAccounts: accountsWithSendEtherInfoSelector(state),
- conversionRate: getConversionRate(state),
fromDropdownOpen: getFromDropdownOpen(state),
tokenContract: getSelectedTokenContract(state),
}
@@ -34,14 +33,14 @@ function mapStateToProps (state) {
function mapDispatchToProps (dispatch) {
return {
+ closeFromDropdown: () => dispatch(closeFromDropdown()),
+ openFromDropdown: () => dispatch(openFromDropdown()),
+ updateSendFrom: newFrom => dispatch(updateSendFrom(newFrom)),
updateSendTokenBalance: (usersToken, selectedToken) => {
if (!usersToken) return
const tokenBalance = calcTokenUpdateAmount(selectedToken, selectedToken)
dispatch(updateSendTokenBalance(tokenBalance))
},
- updateSendFrom: newFrom => dispatch(updateSendFrom(newFrom)),
- openFromDropdown: () => dispatch(openFromDropdown()),
- closeFromDropdown: () => dispatch(closeFromDropdown()),
}
}
diff --git a/ui/app/components/send_/send-content/send-from-row/send-from-row.utils.js b/ui/app/components/send_/send-content/send-from-row/send-from-row.utils.js
index 4faae48dc..0aaaef793 100644
--- a/ui/app/components/send_/send-content/send-from-row/send-from-row.utils.js
+++ b/ui/app/components/send_/send-content/send-from-row/send-from-row.utils.js
@@ -8,5 +8,5 @@ function calcTokenUpdateAmount (usersToken, selectedToken) {
}
module.exports = {
- calcTokenUpdateAmount
+ calcTokenUpdateAmount,
}
diff --git a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
index 056a04aae..65dc6ad93 100644
--- a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
+++ b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
@@ -8,20 +8,23 @@ export default class SendGasRow extends Component {
static propTypes = {
closeFromDropdown: PropTypes.func,
conversionRate: PropTypes.number,
+ convertedCurrency: PropTypes.string,
from: PropTypes.string,
fromAccounts: PropTypes.array,
fromDropdownOpen: PropTypes.bool,
+ gasLoadingError: PropTypes.bool,
+ gasTotal: PropTypes.string,
openFromDropdown: PropTypes.func,
+ showCustomizeGasModal: PropTypes.bool,
tokenContract: PropTypes.object,
updateSendFrom: PropTypes.func,
updateSendTokenBalance: PropTypes.func,
- gasLoadingError: PropTypes.bool,
};
async handleFromChange (newFrom) {
const {
- updateSendFrom,
tokenContract,
+ updateSendFrom,
updateSendTokenBalance,
} = this.props
@@ -36,22 +39,22 @@ export default class SendGasRow extends Component {
const {
conversionRate,
convertedCurrency,
- showCustomizeGasModal,
- gasTotal,
gasLoadingError,
+ gasTotal,
+ showCustomizeGasModal,
} = this.props
return (
<SendRowWrapper label={`${this.context.t('gasFee')}:`}>
<GasFeeDisplay
- gasTotal={gasTotal}
conversionRate={conversionRate}
convertedCurrency={convertedCurrency}
- onClick={() => showCustomizeGasModal()}
gasLoadingError={gasLoadingError}
+ gasTotal={gasTotal}
+ onClick={() => showCustomizeGasModal()}
/>
</SendRowWrapper>
- );
+ )
}
}
diff --git a/ui/app/components/send_/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.component.js b/ui/app/components/send_/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.component.js
index e553ae67e..c031248c7 100644
--- a/ui/app/components/send_/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.component.js
+++ b/ui/app/components/send_/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.component.js
@@ -14,13 +14,13 @@ export default class SendRowErrorMessage extends Component {
return (
errorMessage
- ? <div className='send-v2__error'>{this.context.t(errorMessage)}</div>
+ ? <div className="send-v2__error">{this.context.t(errorMessage)}</div>
: null
- );
+ )
}
}
SendRowErrorMessage.contextTypes = {
t: PropTypes.func,
-} \ No newline at end of file
+}
diff --git a/ui/app/components/send_/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.container.js b/ui/app/components/send_/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.container.js
index 002426904..59622047f 100644
--- a/ui/app/components/send_/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.container.js
+++ b/ui/app/components/send_/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.container.js
@@ -9,4 +9,4 @@ function mapStateToProps (state, ownProps) {
errors: getSendErrors(state),
errorType: ownProps.errorType,
}
-} \ No newline at end of file
+}
diff --git a/ui/app/components/send_/send-content/send-row-wrapper/send-row-wrapper.component.js b/ui/app/components/send_/send-content/send-row-wrapper/send-row-wrapper.component.js
index 99134a466..c6b75eccd 100644
--- a/ui/app/components/send_/send-content/send-row-wrapper/send-row-wrapper.component.js
+++ b/ui/app/components/send_/send-content/send-row-wrapper/send-row-wrapper.component.js
@@ -5,22 +5,22 @@ import SendRowErrorMessage from './send-row-error-message/send-row-error-message
export default class SendRowWrapper extends Component {
static propTypes = {
- label: PropTypes.string,
- showError: PropTypes.bool,
children: PropTypes.node,
errorType: PropTypes.string,
+ label: PropTypes.string,
+ showError: PropTypes.bool,
};
render () {
const {
- label,
- errorType = '',
- showError = false,
- children,
+ children,
+ errorType = '',
+ label,
+ showError = false,
} = this.props
- let formField = Array.isArray(children) ? children[1] || children[0] : children
- let customLabelContent = children.length === 1 ? children[0] : null
+ const formField = Array.isArray(children) ? children[1] || children[0] : children
+ const customLabelContent = children.length === 1 ? children[0] : null
return (
<div className="send-v2__form-row">
@@ -33,7 +33,7 @@ export default class SendRowWrapper extends Component {
{formField}
</div>
</div>
- );
+ )
}
}
diff --git a/ui/app/components/send_/send-content/send-to-row/send-to-row.component.js b/ui/app/components/send_/send-content/send-to-row/send-to-row.component.js
index a20bbf434..a6e4c1624 100644
--- a/ui/app/components/send_/send-content/send-to-row/send-to-row.component.js
+++ b/ui/app/components/send_/send-content/send-to-row/send-to-row.component.js
@@ -6,15 +6,15 @@ import EnsInput from '../../../ens-input'
export default class SendToRow extends Component {
static propTypes = {
+ closeToDropdown: PropTypes.func,
+ inError: PropTypes.bool,
+ network: PropTypes.string,
+ openToDropdown: PropTypes.func,
to: PropTypes.string,
toAccounts: PropTypes.array,
toDropdownOpen: PropTypes.bool,
- inError: PropTypes.bool,
updateSendTo: PropTypes.func,
updateSendToError: PropTypes.func,
- openToDropdown: PropTypes.func,
- closeToDropdown: PropTypes.func,
- network: PropTypes.string,
};
handleToChange (to, nickname = '') {
@@ -25,40 +25,35 @@ export default class SendToRow extends Component {
render () {
const {
- from,
- fromAccounts,
- toAccounts,
- conversionRate,
- fromDropdownOpen,
- tokenContract,
- openToDropdown,
closeToDropdown,
- network,
inError,
+ network,
+ openToDropdown,
to,
+ toAccounts,
toDropdownOpen,
} = this.props
return (
<SendRowWrapper
+ errorType={'to'}
label={`${this.context.t('to')}:`}
showError={inError}
- errorType={'to'}
>
<EnsInput
- name={'address'}
- placeholder={this.context.t('recipientAddress')}
- network={network}
- to={to}
accounts={toAccounts}
- dropdownOpen={toDropdownOpen}
- openDropdown={() => openToDropdown()}
closeDropdown={() => closeToDropdown()}
- onChange={(newTo, newNickname) => this.handleToChange(newTo, newNickname)}
+ dropdownOpen={toDropdownOpen}
inError={inError}
+ name={'address'}
+ network={network}
+ onChange={(newTo, newNickname) => this.handleToChange(newTo, newNickname)}
+ openDropdown={() => openToDropdown()}
+ placeholder={this.context.t('recipientAddress')}
+ to={to}
/>
</SendRowWrapper>
- );
+ )
}
}
diff --git a/ui/app/components/send_/send-content/send-to-row/send-to-row.container.js b/ui/app/components/send_/send-content/send-to-row/send-to-row.container.js
index 661ec1f0c..b55455f8b 100644
--- a/ui/app/components/send_/send-content/send-to-row/send-to-row.container.js
+++ b/ui/app/components/send_/send-content/send-to-row/send-to-row.container.js
@@ -1,8 +1,7 @@
import { connect } from 'react-redux'
import {
- getSendTo,
- getToAccounts,
getCurrentNetwork,
+ getSendTo,
getSendToAccounts,
} from '../../send.selectors.js'
import {
@@ -23,23 +22,22 @@ import SendToRow from './send-to-row.component'
export default connect(mapStateToProps, mapDispatchToProps)(SendToRow)
function mapStateToProps (state) {
- updateSendTo
return {
+ inError: sendToIsInError(state),
+ network: getCurrentNetwork(state),
to: getSendTo(state),
toAccounts: getSendToAccounts(state),
toDropdownOpen: getToDropdownOpen(state),
- inError: sendToIsInError(state),
- network: getCurrentNetwork(state),
}
}
function mapDispatchToProps (dispatch) {
return {
+ closeToDropdown: () => dispatch(closeToDropdown()),
+ openToDropdown: () => dispatch(openToDropdown()),
+ updateSendTo: (to, nickname) => dispatch(updateSendTo(to, nickname)),
updateSendToError: (to) => {
dispatch(updateSendErrors(getToErrorObject(to)))
},
- updateSendTo: (to, nickname) => dispatch(updateSendTo(to, nickname)),
- openToDropdown: () => dispatch(openToDropdown()),
- closeToDropdown: () => dispatch(closeToDropdown()),
}
-} \ No newline at end of file
+}
diff --git a/ui/app/components/send_/send-content/send-to-row/send-to-row.utils.js b/ui/app/components/send_/send-content/send-to-row/send-to-row.utils.js
index 52bfde009..d290bf461 100644
--- a/ui/app/components/send_/send-content/send-to-row/send-to-row.utils.js
+++ b/ui/app/components/send_/send-content/send-to-row/send-to-row.utils.js
@@ -8,10 +8,10 @@ function getToErrorObject (to) {
} else if (!isValidAddress(to)) {
toError = 'invalidAddressRecipient'
}
-
+
return { to: toError }
}
module.exports = {
- getToErrorObject
+ getToErrorObject,
}