Lint fixes and alphabetization for i3725-refactor-send-component

4 files changed, 26 insertions, 28 deletions

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