diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2018-01-18 05:48:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-18 05:48:16 +0800 |
| commit | b80ed2c451fee7b94edea9d1655baa2e908939b9 (patch) | |
| tree | e9a67e289f043900a77b1bfb34088ad2e5f83864 /old-ui/app/conf-tx.js | |
| parent | ccb80594be3000488b7c73f9fd5e56168e0d5042 (diff) | |
| parent | aa08d1a09dce7324eaa3b3df568df43f8c55cc63 (diff) | |
| download | tangerine-wallet-browser-b80ed2c451fee7b94edea9d1655baa2e908939b9.tar.gz tangerine-wallet-browser-b80ed2c451fee7b94edea9d1655baa2e908939b9.tar.zst tangerine-wallet-browser-b80ed2c451fee7b94edea9d1655baa2e908939b9.zip | |
Merge pull request #3007 from alextsg/uat-master-011618
[NewUI] Merge master into uat branch
Diffstat (limited to 'old-ui/app/conf-tx.js')
| -rw-r--r-- | old-ui/app/conf-tx.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/old-ui/app/conf-tx.js b/old-ui/app/conf-tx.js index 15c937b1c..5e2ae9e78 100644 --- a/old-ui/app/conf-tx.js +++ b/old-ui/app/conf-tx.js @@ -4,6 +4,7 @@ const h = require('react-hyperscript') const connect = require('react-redux').connect const actions = require('../../ui/app/actions') const NetworkIndicator = require('./components/network') +const LoadingIndicator = require('./components/loading') const txHelper = require('../lib/tx-helper') const isPopupOrNotification = require('../../app/scripts/lib/is-popup-or-notification') @@ -60,6 +61,11 @@ ConfirmTxScreen.prototype.render = function () { h('.flex-column.flex-grow', [ + h(LoadingIndicator, { + isLoading: txData.loadingDefaults, + loadingMessage: 'Estimating transaction cost…', + }), + // subtitle and nav h('.section-title.flex-row.flex-center', [ !isNotification ? h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { |