1 files changed, 11 insertions, 5 deletions
diff --git a/ui/app/components/send_/send.component.js b/ui/app/components/send_/send.component.js
index 21e1de09b..516251e22 100644
--- a/ui/app/components/send_/send.component.js
+++ b/ui/app/components/send_/send.component.js
@@ -18,8 +18,8 @@ export default class SendTransactionScreen extends PersistentForm {
       PropTypes.string,
       PropTypes.number,
     ]),
+    blockGasLimit: PropTypes.string,
     conversionRate: PropTypes.number,
-    data: PropTypes.string,
     editingTransactionId: PropTypes.string,
     from: PropTypes.object,
     gasLimit: PropTypes.string,
@@ -28,6 +28,7 @@ export default class SendTransactionScreen extends PersistentForm {
     history: PropTypes.object,
     network: PropTypes.string,
     primaryCurrency: PropTypes.string,
+    recentBlocks: PropTypes.array,
     selectedAddress: PropTypes.string,
     selectedToken: PropTypes.object,
     tokenBalance: PropTypes.string,
@@ -37,24 +38,29 @@ export default class SendTransactionScreen extends PersistentForm {
     updateSendTokenBalance: PropTypes.func,
   };
 
-  updateGas () {
+  updateGas ({ to } = {}) {
     const {
-      data,
+      amount,
+      blockGasLimit,
       editingTransactionId,
       gasLimit,
       gasPrice,
+      recentBlocks,
       selectedAddress,
       selectedToken = {},
       updateAndSetGasTotal,
     } = this.props
 
     updateAndSetGasTotal({
-      data,
+      blockGasLimit,
       editingTransactionId,
       gasLimit,
       gasPrice,
+      recentBlocks,
       selectedAddress,
       selectedToken,
+      to: to && to.toLowerCase(),
+      value: amount,
     })
   }
 
@@ -141,7 +147,7 @@ export default class SendTransactionScreen extends PersistentForm {
     return (
       <div className="page-container">
         <SendHeader history={history}/>
-        <SendContent/>
+        <SendContent updateGas={(updateData) => this.updateGas(updateData)}/>
         <SendFooter history={history}/>
       </div>
     )