From 8bb57f33b186e373ee6be4cb8f7418d38934f218 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Wed, 17 Jan 2018 18:17:41 -0800
Subject: [PATCH 1/2] add a `x` close button to gas calc loding screen on
 conf-tx

---
 ui/app/components/loading.js | 12 +++++++++++-
 ui/app/conf-tx.js            |  6 +++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ui/app/components/loading.js b/ui/app/components/loading.js
index 163792584..b8e2eb599 100644
--- a/ui/app/components/loading.js
+++ b/ui/app/components/loading.js
@@ -11,7 +11,7 @@ function LoadingIndicator () {
 }
 
 LoadingIndicator.prototype.render = function () {
-  const { isLoading, loadingMessage } = this.props
+  const { isLoading, loadingMessage, canBypass, bypass } = this.props
 
   return (
     isLoading ? h('.full-flex-height', {
@@ -28,6 +28,16 @@ LoadingIndicator.prototype.render = function () {
         background: 'rgba(255, 255, 255, 0.8)',
       },
     }, [
+      canBypass ? h( 'i.fa.fa-close.cursor-pointer.close-loading', {
+        style: {
+          position: 'absolute',
+          top: '1px',
+          right: '15px',
+          color: '#AEAEAE',
+        },
+        onClick: bypass,
+      }) : null,
+
       h('img', {
         src: 'images/loading.svg',
       }),
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index ce4d153b5..9c8f98fa8 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -62,8 +62,12 @@ ConfirmTxScreen.prototype.render = function () {
     h('.flex-column.flex-grow', [
 
       h(LoadingIndicator, {
-        isLoading: txData.loadingDefaults,
+        isLoading: this.state ? !this.state.bypassLoadingScreen : txData.loadingDefaults,
         loadingMessage: 'Estimating transaction cost…',
+        canBypass: true,
+        bypass: () => {
+          this.setState({bypassLoadingScreen: true})
+        },
       }),
 
       // subtitle and nav

From 128b64cc2c955a31f542e3615364560c271de8a7 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 22 Jan 2018 11:15:05 -0800
Subject: [PATCH 2/2] Bump changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5f85dbb2..c4efbe00e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Master
 
+- Add ability to bypass gas estimation loading indicator.
+
 ## 3.13.5 2018-1-16
 
 - Estimating gas limit for simple ether sends now faster & cheaper, by avoiding VM usage on recipients with no code.