aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2018-01-23 03:40:22 +0800
committerGitHub <noreply@github.com>2018-01-23 03:40:22 +0800
commitb76f59004361e5f1300c12b20234b6bb1ebfde0f (patch)
tree298ccc06b041d15dfedadf9884935454456dd50b
parent98b5a62fa74aa6730a25df28dfe5032cfb487697 (diff)
parent128b64cc2c955a31f542e3615364560c271de8a7 (diff)
downloadtangerine-wallet-browser-b76f59004361e5f1300c12b20234b6bb1ebfde0f.tar.gz
tangerine-wallet-browser-b76f59004361e5f1300c12b20234b6bb1ebfde0f.tar.zst
tangerine-wallet-browser-b76f59004361e5f1300c12b20234b6bb1ebfde0f.zip
Merge pull request #3025 from MetaMask/i#3018
add a `x` close button to gas calc loding screen on conf-tx
-rw-r--r--CHANGELOG.md2
-rw-r--r--ui/app/components/loading.js12
-rw-r--r--ui/app/conf-tx.js6
3 files changed, 18 insertions, 2 deletions
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.
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