From faa4ffe1636ce9f7cc68bffe1eb7b1e685a2d000 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Mon, 19 Mar 2018 14:32:58 -0700
Subject: new-ui - dont exclude `txParams.data` when editing and updating
 txParams

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

(limited to 'ui/app/send-v2.js')

diff --git a/ui/app/send-v2.js b/ui/app/send-v2.js
index fc1df1f51..491c4dda3 100644
--- a/ui/app/send-v2.js
+++ b/ui/app/send-v2.js
@@ -571,9 +571,11 @@ SendTransactionScreen.prototype.getEditedTx = function () {
       data,
     })
   } else {
+    const data = unapprovedTxs[editingTransactionId].txParams.data
     Object.assign(editingTx.txParams, {
       value: ethUtil.addHexPrefix(amount),
       to: ethUtil.addHexPrefix(to),
+      data,
     })
   }
 
-- 
cgit v1.2.3


From 5cdaf270f798218bddc72bde05d8ab77267cfb94 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Tue, 20 Mar 2018 06:47:45 -0230
Subject: Don't block user from setting gas if estimating gas returns errors.
 (#3627)

---
 ui/app/send-v2.js | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'ui/app/send-v2.js')

diff --git a/ui/app/send-v2.js b/ui/app/send-v2.js
index fc1df1f51..5ac59fc29 100644
--- a/ui/app/send-v2.js
+++ b/ui/app/send-v2.js
@@ -42,6 +42,7 @@ function SendTransactionScreen () {
       to: null,
       amount: null,
     },
+    gasLoadingError: false,
   }
 
   this.handleToChange = this.handleToChange.bind(this)
@@ -128,6 +129,10 @@ SendTransactionScreen.prototype.updateGas = function () {
       .then(([gasPrice, gas]) => {
         const newGasTotal = this.getGasTotal(gas, gasPrice)
         updateGasTotal(newGasTotal)
+        this.setState({ gasLoadingError: false })
+      })
+      .catch(err => {
+        this.setState({ gasLoadingError: true })
       })
   } else {
     const newGasTotal = this.getGasTotal(gasLimit, gasPrice)
@@ -436,6 +441,7 @@ SendTransactionScreen.prototype.renderGasRow = function () {
     showCustomizeGasModal,
     gasTotal,
   } = this.props
+  const { gasLoadingError } = this.state
 
   return h('div.send-v2__form-row', [
 
@@ -448,6 +454,7 @@ SendTransactionScreen.prototype.renderGasRow = function () {
         conversionRate,
         convertedCurrency,
         onClick: showCustomizeGasModal,
+        gasLoadingError,
       }),
 
     ]),
-- 
cgit v1.2.3