From 5ee40675b9f986a9ff2e5d15a271d7de2145d0e9 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Mon, 30 Jul 2018 22:03:20 -0700
Subject: Refactor transactions list views. Add redesign components

---
 .../transaction-action.component.js                | 52 ++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 ui/app/components/transaction-action/transaction-action.component.js

(limited to 'ui/app/components/transaction-action/transaction-action.component.js')

diff --git a/ui/app/components/transaction-action/transaction-action.component.js b/ui/app/components/transaction-action/transaction-action.component.js
new file mode 100644
index 000000000..b608615d0
--- /dev/null
+++ b/ui/app/components/transaction-action/transaction-action.component.js
@@ -0,0 +1,52 @@
+import React, { PureComponent } from 'react'
+import PropTypes from 'prop-types'
+import { getTransactionActionKey } from '../../helpers/transactions.util'
+
+export default class TransactionAction extends PureComponent {
+  static contextTypes = {
+    tOrDefault: PropTypes.func,
+  }
+
+  static propTypes = {
+    className: PropTypes.string,
+    transaction: PropTypes.object,
+    methodData: PropTypes.object,
+  }
+
+  state = {
+    transactionAction: '',
+  }
+
+  componentDidMount () {
+    this.getTransactionAction()
+  }
+
+  componentDidUpdate () {
+    this.getTransactionAction()
+  }
+
+  getTransactionAction () {
+    const { transactionAction } = this.state
+    const { transaction, methodData } = this.props
+    const { data, isFetching } = methodData
+
+    if (isFetching || transactionAction) {
+      return
+    }
+
+    const actionKey = getTransactionActionKey(transaction, data)
+    const action = actionKey && this.context.tOrDefault(actionKey)
+    this.setState({ transactionAction: action })
+  }
+
+  render () {
+    const { className } = this.props
+    const { transactionAction } = this.state
+
+    return (
+      <div className={className}>
+        { transactionAction || '--' }
+      </div>
+    )
+  }
+}
-- 
cgit 


From 5dcd8ceb7bbaef33fef5588feceac17577679e74 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Tue, 7 Aug 2018 01:57:46 -0700
Subject: Fix e2e tests

---
 .../components/transaction-action/transaction-action.component.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ui/app/components/transaction-action/transaction-action.component.js')

diff --git a/ui/app/components/transaction-action/transaction-action.component.js b/ui/app/components/transaction-action/transaction-action.component.js
index b608615d0..9f447fe5c 100644
--- a/ui/app/components/transaction-action/transaction-action.component.js
+++ b/ui/app/components/transaction-action/transaction-action.component.js
@@ -28,9 +28,9 @@ export default class TransactionAction extends PureComponent {
   getTransactionAction () {
     const { transactionAction } = this.state
     const { transaction, methodData } = this.props
-    const { data, isFetching } = methodData
+    const { data, done } = methodData
 
-    if (isFetching || transactionAction) {
+    if (!done || transactionAction) {
       return
     }
 
@@ -40,12 +40,12 @@ export default class TransactionAction extends PureComponent {
   }
 
   render () {
-    const { className } = this.props
+    const { className, methodData: { isFetching } } = this.props
     const { transactionAction } = this.state
 
     return (
       <div className={className}>
-        { transactionAction || '--' }
+        { (!isFetching && transactionAction) || '--' }
       </div>
     )
   }
-- 
cgit 


From 342522c6cf23670f931e69ba822eedfd2d6ee252 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Thu, 23 Aug 2018 16:44:38 -0700
Subject: Fix naming, add eth.getCode check for actions, fix translations for
 statuses

---
 .../components/transaction-action/transaction-action.component.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ui/app/components/transaction-action/transaction-action.component.js')

diff --git a/ui/app/components/transaction-action/transaction-action.component.js b/ui/app/components/transaction-action/transaction-action.component.js
index 9f447fe5c..81a1e96d0 100644
--- a/ui/app/components/transaction-action/transaction-action.component.js
+++ b/ui/app/components/transaction-action/transaction-action.component.js
@@ -25,7 +25,7 @@ export default class TransactionAction extends PureComponent {
     this.getTransactionAction()
   }
 
-  getTransactionAction () {
+  async getTransactionAction () {
     const { transactionAction } = this.state
     const { transaction, methodData } = this.props
     const { data, done } = methodData
@@ -34,18 +34,18 @@ export default class TransactionAction extends PureComponent {
       return
     }
 
-    const actionKey = getTransactionActionKey(transaction, data)
+    const actionKey = await getTransactionActionKey(transaction, data)
     const action = actionKey && this.context.tOrDefault(actionKey)
     this.setState({ transactionAction: action })
   }
 
   render () {
-    const { className, methodData: { isFetching } } = this.props
+    const { className, methodData: { done } } = this.props
     const { transactionAction } = this.state
 
     return (
       <div className={className}>
-        { (!isFetching && transactionAction) || '--' }
+        { (done && transactionAction) || '--' }
       </div>
     )
   }
-- 
cgit 


From 04ec3f0b6b3c66b8d75b7d3da257680a97453915 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Mon, 17 Sep 2018 10:09:48 -0700
Subject: Fix Transaction view styles

---
 ui/app/components/transaction-action/transaction-action.component.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui/app/components/transaction-action/transaction-action.component.js')

diff --git a/ui/app/components/transaction-action/transaction-action.component.js b/ui/app/components/transaction-action/transaction-action.component.js
index 81a1e96d0..1729b878c 100644
--- a/ui/app/components/transaction-action/transaction-action.component.js
+++ b/ui/app/components/transaction-action/transaction-action.component.js
@@ -4,7 +4,7 @@ import { getTransactionActionKey } from '../../helpers/transactions.util'
 
 export default class TransactionAction extends PureComponent {
   static contextTypes = {
-    tOrDefault: PropTypes.func,
+    t: PropTypes.func,
   }
 
   static propTypes = {
@@ -35,7 +35,7 @@ export default class TransactionAction extends PureComponent {
     }
 
     const actionKey = await getTransactionActionKey(transaction, data)
-    const action = actionKey && this.context.tOrDefault(actionKey)
+    const action = actionKey && this.context.t(actionKey)
     this.setState({ transactionAction: action })
   }
 
-- 
cgit 


From 50d91f998d0dc228c1d5dac7966df89d6c3fe6c4 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Thu, 4 Oct 2018 19:26:41 -0700
Subject: Translate method names in the transaction list only when applicable

---
 .../transaction-action/transaction-action.component.js         | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'ui/app/components/transaction-action/transaction-action.component.js')

diff --git a/ui/app/components/transaction-action/transaction-action.component.js b/ui/app/components/transaction-action/transaction-action.component.js
index 1729b878c..85761c089 100644
--- a/ui/app/components/transaction-action/transaction-action.component.js
+++ b/ui/app/components/transaction-action/transaction-action.component.js
@@ -1,6 +1,8 @@
 import React, { PureComponent } from 'react'
 import PropTypes from 'prop-types'
+import classnames from 'classnames'
 import { getTransactionActionKey } from '../../helpers/transactions.util'
+import { camelCaseToCapitalize } from '../../helpers/common.util'
 
 export default class TransactionAction extends PureComponent {
   static contextTypes = {
@@ -29,13 +31,17 @@ export default class TransactionAction extends PureComponent {
     const { transactionAction } = this.state
     const { transaction, methodData } = this.props
     const { data, done } = methodData
+    const { name } = data
 
     if (!done || transactionAction) {
       return
     }
 
     const actionKey = await getTransactionActionKey(transaction, data)
-    const action = actionKey && this.context.t(actionKey)
+    const action = actionKey
+      ? this.context.t(actionKey)
+      : camelCaseToCapitalize(name)
+
     this.setState({ transactionAction: action })
   }
 
@@ -44,7 +50,7 @@ export default class TransactionAction extends PureComponent {
     const { transactionAction } = this.state
 
     return (
-      <div className={className}>
+      <div className={classnames('transaction-action', className)}>
         { (done && transactionAction) || '--' }
       </div>
     )
-- 
cgit 


From c474f30929e91fc2aeadba7de9faef70d4ce2e07 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Fri, 5 Oct 2018 13:02:55 -0700
Subject: Fix action translations edge cases

---
 ui/app/components/transaction-action/transaction-action.component.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/components/transaction-action/transaction-action.component.js')

diff --git a/ui/app/components/transaction-action/transaction-action.component.js b/ui/app/components/transaction-action/transaction-action.component.js
index 85761c089..1de91cb71 100644
--- a/ui/app/components/transaction-action/transaction-action.component.js
+++ b/ui/app/components/transaction-action/transaction-action.component.js
@@ -31,7 +31,7 @@ export default class TransactionAction extends PureComponent {
     const { transactionAction } = this.state
     const { transaction, methodData } = this.props
     const { data, done } = methodData
-    const { name } = data
+    const { name = '' } = data
 
     if (!done || transactionAction) {
       return
-- 
cgit