From 26f965bcceb26ce7cdec9df9f213b44be8d9acac Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Fri, 27 Apr 2018 16:33:00 -0230
Subject: Further refactors; includes refactor of send-v2.js and associated
 container

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

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

diff --git a/ui/app/components/send_/send.component.js b/ui/app/components/send_/send.component.js
index e69de29bb..e014e5bce 100644
--- a/ui/app/components/send_/send.component.js
+++ b/ui/app/components/send_/send.component.js
@@ -0,0 +1,143 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import PersistentForm from '../../../lib/persistent-form'
+import {
+  getAmountErrorObject,
+  doesAmountErrorRequireUpdate,
+} from './send.utils'
+
+import PageContainer from '..//page-container/page-container.component'
+import SendHeader from './send-header/send-header.container'
+import SendContent from './send-content/send-content.component'
+import SendFooter from './send-footer/send-footer.container'
+
+export default class SendTransactionScreen extends PersistentForm {
+
+  static propTypes = {
+    amount: PropTypes.string,
+    amountConversionRate: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.number,
+    ]),
+    conversionRate: PropTypes.number,
+    data: PropTypes.string,
+    editingTransactionId: PropTypes.string,
+    from: PropTypes.object,
+    gasLimit: PropTypes.string,
+    gasPrice: PropTypes.string,
+    gasTotal: PropTypes.string,
+    history: PropTypes.object,
+    network: PropTypes.string,
+    primaryCurrency: PropTypes.string,
+    selectedAddress: PropTypes.string,
+    selectedToken: PropTypes.object,
+    tokenBalance: PropTypes.string,
+    tokenContract: PropTypes.object,
+    updateAndSetGasTotal: PropTypes.func,
+    updateSendErrors: PropTypes.func,
+    updateSendTokenBalance: PropTypes.func,
+  };
+
+  updateGas () {
+    const {
+      data,
+      editingTransactionId,
+      gasLimit,
+      gasPrice,
+      selectedAddress,
+      selectedToken = {},
+      updateAndSetGasTotal,
+    } = this.props
+
+    updateAndSetGasTotal({
+      data,
+      editingTransactionId,
+      gasLimit,
+      gasPrice,
+      selectedAddress,
+      selectedToken,
+    })
+  }
+
+  componentDidUpdate (prevProps) {
+    const {
+      amount,
+      amountConversionRate,
+      conversionRate,
+      from: { address, balance },
+      gasTotal,
+      network,
+      primaryCurrency,
+      selectedToken,
+      tokenBalance,
+      updateSendErrors,
+      updateSendTokenBalance,
+      tokenContract,
+    } = this.props
+
+    const {
+      from: { balance: prevBalance },
+      gasTotal: prevGasTotal,
+      tokenBalance: prevTokenBalance,
+      network: prevNetwork,
+    } = prevProps
+
+    const uninitialized = [prevBalance, prevGasTotal].every(n => n === null)
+
+    if (!uninitialized) {
+      const amountErrorRequiresUpdate = doesAmountErrorRequireUpdate({
+        balance,
+        gasTotal,
+        prevBalance,
+        prevGasTotal,
+        prevTokenBalance,
+        selectedToken,
+        tokenBalance,
+      })
+
+      if (amountErrorRequiresUpdate) {
+        const amountErrorObject = getAmountErrorObject({
+          amount,
+          amountConversionRate,
+          balance,
+          conversionRate,
+          gasTotal,
+          primaryCurrency,
+          selectedToken,
+          tokenBalance,
+        })
+        updateSendErrors(amountErrorObject)
+      }
+
+      if (network !== prevNetwork && network !== 'loading') {
+        updateSendTokenBalance({
+          selectedToken,
+          tokenContract,
+          address,
+        })
+        this.updateGas()
+      }
+    }
+  }
+
+  componentWillMount () {
+    this.updateGas()
+  }
+
+  render () {
+    const { history } = this.props
+
+    return (
+      <PageContainer>
+        <SendHeader/>
+        <SendContent/>
+        <SendFooter history={history}/>
+      </PageContainer>
+    )
+  }
+
+}
+
+SendTransactionScreen.contextTypes = {
+  t: PropTypes.func,
+}
-- 
cgit 


From 5529ec6efd6fa659d790b4641e47cf247b7cfca7 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Mon, 30 Apr 2018 13:00:51 -0230
Subject: Fix close button on send screen

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

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

diff --git a/ui/app/components/send_/send.component.js b/ui/app/components/send_/send.component.js
index e014e5bce..969d76946 100644
--- a/ui/app/components/send_/send.component.js
+++ b/ui/app/components/send_/send.component.js
@@ -129,7 +129,7 @@ export default class SendTransactionScreen extends PersistentForm {
 
     return (
       <PageContainer>
-        <SendHeader/>
+        <SendHeader history={history}/>
         <SendContent/>
         <SendFooter history={history}/>
       </PageContainer>
-- 
cgit