From 284dd85a99f538b77fd477f4952117d1792f64a5 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Fri, 6 Apr 2018 19:59:51 -0230
Subject: first commit

---
 .../send-content/send-from-row/from-dropdown/from-dropdown.component.js   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js

(limited to 'ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js')

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
new file mode 100644
index 000000000..e69de29bb
-- 
cgit 


From 8ff7806f1b471a90fa3f45ebc10f0f4452ade541 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Thu, 26 Apr 2018 14:08:38 -0230
Subject: Core of the refactor complete

---
 .../from-dropdown/from-dropdown.component.js       | 75 ++++++++++++++++++++++
 1 file changed, 75 insertions(+)

(limited to 'ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js')

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 e69de29bb..f215179ba 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
@@ -0,0 +1,75 @@
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+import AccountListItem from '../../../account-list-item/account-list-item.container'
+
+export default class FromDropdown extends Component {
+
+  static propTypes = {
+    accounts: PropTypes.array,
+    closeDropdown: PropTypes.func,
+    dropdownOpen: PropTypes.bool,
+    onSelect: PropTypes.func,
+    openDropdown: PropTypes.func,
+    selectedAccount: PropTypes.object,
+  };
+
+  renderListItemIcon (icon, color) {
+    return <i className={`fa ${icon} fa-lg`} style={ { color } }/>
+  }
+
+  getListItemIcon (currentAccount, selectedAccount) {
+    return currentAccount.address === selectedAccount.address
+      ? this.renderListItemIcon('fa-check', '#02c9b1')
+      : null
+  }
+
+  renderDropdown () {
+    const {
+      accounts,
+      selectedAccount,
+      closeDropdown,
+      onSelect,
+    } = this.props
+
+    return (<div>
+      <div
+        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'
+          account={account}
+          handleClick={() => {
+            onSelect(account)
+            closeDropdown()
+          }}
+          icon={this.getListItemIcon(account, selectedAccount.address)}
+        />)}
+      </div>
+    </div>)
+  }
+
+  render () {
+    const {
+      selectedAccount,
+      openDropdown,
+      dropdownOpen,
+    } = this.props
+    console.log(`&*& openDropdown`, openDropdown);
+    console.log(`&*& dropdownOpen`, dropdownOpen);
+    return <div className='send-v2__from-dropdown'>
+      <AccountListItem
+        account={selectedAccount}
+        handleClick={openDropdown}
+        icon={this.renderListItemIcon('fa-caret-down', '#dedede')}
+      />
+      {dropdownOpen && this.renderDropdown()},
+    </div>
+  }
+
+}
+
+FromDropdown.contextTypes = {
+  t: PropTypes.func,
+}
-- 
cgit 


From 91c201aa72581a59a0d2ef73a225b1768584dea7 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Thu, 26 Apr 2018 22:08:14 -0230
Subject: Lint fixes and alphabetization for i3725-refactor-send-component

---
 .../from-dropdown/from-dropdown.component.js         | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js')

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


From 33c16d1bf62133a87d8f24232ee85438a6b6a0e6 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Fri, 27 Apr 2018 08:11:18 -0230
Subject: Fixes to get tests passing.

---
 .../send-content/send-from-row/from-dropdown/from-dropdown.component.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js')

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 8af8eaf26..337228122 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
@@ -37,7 +37,7 @@ export default class FromDropdown extends Component {
         onClick={() => closeDropdown}
       />
       <div className="send-v2__from-dropdown__list">
-        {...accounts.map((account, index) => <AccountListItem
+        {accounts.map((account, index) => <AccountListItem
           account={account}
           className="account-list-item__dropdown"
           handleClick={() => {
-- 
cgit 


From 61d35e7abec6ef138ae08f1ec013da773083609a Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Fri, 11 May 2018 13:50:43 -0230
Subject: Unit tests for from-dropdown; split out send-dropdown-list from
 from-dropdown

---
 .../from-dropdown/from-dropdown.component.js       | 49 +++++-----------------
 1 file changed, 10 insertions(+), 39 deletions(-)

(limited to 'ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js')

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 337228122..7815887a5 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
@@ -1,6 +1,7 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import AccountListItem from '../../../account-list-item/account-list-item.container'
+import SendDropdownList from '../../send-dropdown-list/send-dropdown-list.component'
 
 export default class FromDropdown extends Component {
 
@@ -13,58 +14,28 @@ export default class FromDropdown extends Component {
     selectedAccount: PropTypes.object,
   };
 
-  renderListItemIcon (icon, color) {
-    return <i className={`fa ${icon} fa-lg`} style={ { color } }/>
-  }
-
-  getListItemIcon (currentAccount, selectedAccount) {
-    return currentAccount.address === selectedAccount.address
-      ? this.renderListItemIcon('fa-check', '#02c9b1')
-      : null
-  }
-
-  renderDropdown () {
+  render () {
     const {
       accounts,
       closeDropdown,
-      onSelect,
-      selectedAccount,
-    } = this.props
-
-    return (<div>
-      <div
-        className="send-v2__from-dropdown__close-area"
-        onClick={() => closeDropdown}
-      />
-      <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>)
-  }
-
-  render () {
-    const {
       dropdownOpen,
       openDropdown,
       selectedAccount,
+      onSelect,
     } = this.props
 
     return <div className="send-v2__from-dropdown">
       <AccountListItem
         account={selectedAccount}
         handleClick={openDropdown}
-        icon={this.renderListItemIcon('fa-caret-down', '#dedede')}
+        icon={<i className={`fa fa-caret-down fa-lg`} style={ { color: '#dedede' } }/>}
       />
-      {dropdownOpen && this.renderDropdown()},
+      {dropdownOpen && <SendDropdownList
+        accounts={accounts}
+        closeDropdown={closeDropdown}
+        onSelect={onSelect}
+        activeAddress={selectedAccount.address}
+      />},
     </div>
   }
 
-- 
cgit 


From 44679f6cdac5e99647964a5fb91a11ee69fe239a Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Tue, 15 May 2018 09:59:23 -0230
Subject: Import defaults in send_/

---
 .../send-from-row/from-dropdown/from-dropdown.component.js            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js')

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 7815887a5..bf95c50fb 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
@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
-import AccountListItem from '../../../account-list-item/account-list-item.container'
-import SendDropdownList from '../../send-dropdown-list/send-dropdown-list.component'
+import AccountListItem from '../../../account-list-item/'
+import SendDropdownList from '../../send-dropdown-list/'
 
 export default class FromDropdown extends Component {
 
-- 
cgit 


From 0de765aa25637cd85e22eebd11b6c4c8a32faf14 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Thu, 24 May 2018 22:30:07 -0230
Subject: Clean up for send refactor PR.

---
 .../send-content/send-from-row/from-dropdown/from-dropdown.component.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js')

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 bf95c50fb..418766cd9 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
@@ -35,7 +35,7 @@ export default class FromDropdown extends Component {
         closeDropdown={closeDropdown}
         onSelect={onSelect}
         activeAddress={selectedAccount.address}
-      />},
+      />}
     </div>
   }
 
-- 
cgit