aboutsummaryrefslogtreecommitdiffstats
path: root/old-ui/app/components
diff options
context:
space:
mode:
authorDan J Miller <danjm.com@gmail.com>2018-01-24 02:38:39 +0800
committerGitHub <noreply@github.com>2018-01-24 02:38:39 +0800
commit62ce65c99ed3e82b034327b2ab20e301675632f5 (patch)
tree9869d35d41b5b1e9e33fa9ff968afb9d1fa1f0ff /old-ui/app/components
parent338ebe5f402ff50dc8d1a91b7b69cd8e262cc789 (diff)
parent97ca86733cb49750a9909b57ac1f31bc0f49abc5 (diff)
downloadtangerine-wallet-browser-62ce65c99ed3e82b034327b2ab20e301675632f5.tar.gz
tangerine-wallet-browser-62ce65c99ed3e82b034327b2ab20e301675632f5.tar.zst
tangerine-wallet-browser-62ce65c99ed3e82b034327b2ab20e301675632f5.zip
Merge pull request #3069 from tmashuang/uat
Revert integration tests to uat to oldUI
Diffstat (limited to 'old-ui/app/components')
-rw-r--r--old-ui/app/components/loading.js12
1 files changed, 11 insertions, 1 deletions
diff --git a/old-ui/app/components/loading.js b/old-ui/app/components/loading.js
index 163792584..b8e2eb599 100644
--- a/old-ui/app/components/loading.js
+++ b/old-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',
}),