diff options
| author | Thomas <tmashuang@gmail.com> | 2018-01-23 17:12:50 +0800 |
|---|---|---|
| committer | Thomas <tmashuang@gmail.com> | 2018-01-23 17:12:50 +0800 |
| commit | 97ca86733cb49750a9909b57ac1f31bc0f49abc5 (patch) | |
| tree | 9869d35d41b5b1e9e33fa9ff968afb9d1fa1f0ff /old-ui/app/conf-tx.js | |
| parent | b62ec394f55b7bf3209cf5e1dc4721648dfc15dc (diff) | |
| download | tangerine-wallet-browser-97ca86733cb49750a9909b57ac1f31bc0f49abc5.tar.gz tangerine-wallet-browser-97ca86733cb49750a9909b57ac1f31bc0f49abc5.tar.zst tangerine-wallet-browser-97ca86733cb49750a9909b57ac1f31bc0f49abc5.zip | |
Merge branch 'master' into uat
Diffstat (limited to 'old-ui/app/conf-tx.js')
| -rw-r--r-- | old-ui/app/conf-tx.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/old-ui/app/conf-tx.js b/old-ui/app/conf-tx.js index 5e2ae9e78..1bb8eb97c 100644 --- a/old-ui/app/conf-tx.js +++ b/old-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 |