From b3d78ed8a1fbea059344b04416fb21bdb1b73f86 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Wed, 20 Jun 2018 13:18:23 -0230
Subject: Remove send_ directory, revert to just having send

Revert accidentally changed constants.

Require defaults in ens-input, gas-fee-display and confirm screens.
---
 .../send/send-content/send-content.component.js    | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 ui/app/components/send/send-content/send-content.component.js

(limited to 'ui/app/components/send/send-content/send-content.component.js')

diff --git a/ui/app/components/send/send-content/send-content.component.js b/ui/app/components/send/send-content/send-content.component.js
new file mode 100644
index 000000000..adc114c0e
--- /dev/null
+++ b/ui/app/components/send/send-content/send-content.component.js
@@ -0,0 +1,28 @@
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+import PageContainerContent from '../../page-container/page-container-content.component'
+import SendAmountRow from './send-amount-row/'
+import SendFromRow from './send-from-row/'
+import SendGasRow from './send-gas-row/'
+import SendToRow from './send-to-row/'
+
+export default class SendContent extends Component {
+
+  static propTypes = {
+    updateGas: PropTypes.func,
+  };
+
+  render () {
+    return (
+      <PageContainerContent>
+        <div className="send-v2__form">
+          <SendFromRow />
+          <SendToRow updateGas={(updateData) => this.props.updateGas(updateData)} />
+          <SendAmountRow updateGas={(updateData) => this.props.updateGas(updateData)} />
+          <SendGasRow />
+        </div>
+      </PageContainerContent>
+    )
+  }
+
+}
-- 
cgit v1.2.3


From 3f9c3d76b6edb70f91363c1e0787707ed1440c41 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Mon, 16 Jul 2018 18:21:02 -0230
Subject: Add hex data row to send screen

---
 ui/app/components/send/send-content/send-content.component.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ui/app/components/send/send-content/send-content.component.js')

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 adc114c0e..7a0b1a18e 100644
--- a/ui/app/components/send/send-content/send-content.component.js
+++ b/ui/app/components/send/send-content/send-content.component.js
@@ -4,6 +4,7 @@ import PageContainerContent from '../../page-container/page-container-content.co
 import SendAmountRow from './send-amount-row/'
 import SendFromRow from './send-from-row/'
 import SendGasRow from './send-gas-row/'
+import SendHexDataRow from './send-hex-data-row'
 import SendToRow from './send-to-row/'
 
 export default class SendContent extends Component {
@@ -20,6 +21,7 @@ export default class SendContent extends Component {
           <SendToRow updateGas={(updateData) => this.props.updateGas(updateData)} />
           <SendAmountRow updateGas={(updateData) => this.props.updateGas(updateData)} />
           <SendGasRow />
+          <SendHexDataRow />
         </div>
       </PageContainerContent>
     )
-- 
cgit v1.2.3