From 1a0b0ce7c792fe9c4a87090b9b34a082425b17e5 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Tue, 8 Oct 2019 14:44:20 -0230
Subject: [PATCH] Fix e2e tests and gas default (#7267)

* Add extra delay after second send3eth.click() in the 'adds multiple transactions' test

* Remove use of ARBITRARY_HIGH_BLOCK_GAS_LIMIT as fallback
---
 test/e2e/metamask-ui.spec.js        | 11 ++++++-----
 ui/app/pages/send/send.constants.js |  3 ---
 ui/app/pages/send/send.utils.js     |  3 +--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js
index 138967738..eed712736 100644
--- a/test/e2e/metamask-ui.spec.js
+++ b/test/e2e/metamask-ui.spec.js
@@ -563,22 +563,23 @@ describe('MetaMask', function () {
       const dapp = windowHandles[1]
 
       await driver.switchTo().window(dapp)
-      await delay(regularDelayMs)
+      await delay(largeDelayMs)
 
       const send3eth = await findElement(driver, By.xpath(`//button[contains(text(), 'Send')]`), 10000)
       await send3eth.click()
-      await delay(largeDelayMs * 2)
+      await delay(largeDelayMs)
 
       const contractDeployment = await findElement(driver, By.xpath(`//button[contains(text(), 'Deploy Contract')]`), 10000)
       await contractDeployment.click()
-      await delay(largeDelayMs * 2)
+      await delay(largeDelayMs)
 
       await send3eth.click()
+      await delay(largeDelayMs)
       await contractDeployment.click()
-      await delay(largeDelayMs * 2)
+      await delay(largeDelayMs)
 
       await driver.switchTo().window(extension)
-      await delay(largeDelayMs * 2)
+      await delay(regularDelayMs)
 
       let transactions = await findElements(driver, By.css('.transaction-list-item'))
       await transactions[3].click()
diff --git a/ui/app/pages/send/send.constants.js b/ui/app/pages/send/send.constants.js
index 52ff823cc..d3fa38d10 100644
--- a/ui/app/pages/send/send.constants.js
+++ b/ui/app/pages/send/send.constants.js
@@ -6,8 +6,6 @@ const MIN_GAS_PRICE_HEX = (parseInt(MIN_GAS_PRICE_DEC)).toString(16)
 const MIN_GAS_LIMIT_DEC = '21000'
 const MIN_GAS_LIMIT_HEX = (parseInt(MIN_GAS_LIMIT_DEC)).toString(16)
 
-const ARBITRARY_HIGH_BLOCK_GAS_LIMIT = (parseInt('8000000')).toString(16)
-
 const MIN_GAS_PRICE_GWEI = ethUtil.addHexPrefix(conversionUtil(MIN_GAS_PRICE_HEX, {
   fromDenomination: 'WEI',
   toDenomination: 'GWEI',
@@ -60,5 +58,4 @@ module.exports = {
   SIMPLE_GAS_COST,
   TOKEN_TRANSFER_FUNCTION_SIGNATURE,
   BASE_TOKEN_GAS_COST,
-  ARBITRARY_HIGH_BLOCK_GAS_LIMIT,
 }
diff --git a/ui/app/pages/send/send.utils.js b/ui/app/pages/send/send.utils.js
index f4985e4a0..89513bfc1 100644
--- a/ui/app/pages/send/send.utils.js
+++ b/ui/app/pages/send/send.utils.js
@@ -18,7 +18,6 @@ const {
   ONE_GWEI_IN_WEI_HEX,
   SIMPLE_GAS_COST,
   TOKEN_TRANSFER_FUNCTION_SIGNATURE,
-  ARBITRARY_HIGH_BLOCK_GAS_LIMIT,
 } = require('./send.constants')
 const abi = require('ethereumjs-abi')
 const ethUtil = require('ethereumjs-util')
@@ -245,7 +244,7 @@ async function estimateGas ({
 
   // if not, fall back to block gasLimit
   if (!blockGasLimit) {
-    blockGasLimit = ARBITRARY_HIGH_BLOCK_GAS_LIMIT
+    blockGasLimit = MIN_GAS_LIMIT_HEX
   }
 
   paramsForGasEstimate.gas = ethUtil.addHexPrefix(multiplyCurrencies(blockGasLimit, 0.95, {