diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-03-01 04:06:46 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2017-03-01 04:06:46 +0800 |
| commit | 6f2d14fde4e6c3add0194caa5b7e2ea77e5dfb15 (patch) | |
| tree | 0c44f4b8fa76c93d30a05c08014edeb8510d3caa /ui/app/conf-tx.js | |
| parent | 61a19a028b0cf56230fc6512b5f5651d7e1aad5b (diff) | |
| parent | 2e16e1eb94d0ec68da74d3ee4ce1c9ac2115c13d (diff) | |
| download | tangerine-wallet-browser-6f2d14fde4e6c3add0194caa5b7e2ea77e5dfb15.tar tangerine-wallet-browser-6f2d14fde4e6c3add0194caa5b7e2ea77e5dfb15.tar.gz tangerine-wallet-browser-6f2d14fde4e6c3add0194caa5b7e2ea77e5dfb15.tar.bz2 tangerine-wallet-browser-6f2d14fde4e6c3add0194caa5b7e2ea77e5dfb15.tar.lz tangerine-wallet-browser-6f2d14fde4e6c3add0194caa5b7e2ea77e5dfb15.tar.xz tangerine-wallet-browser-6f2d14fde4e6c3add0194caa5b7e2ea77e5dfb15.tar.zst tangerine-wallet-browser-6f2d14fde4e6c3add0194caa5b7e2ea77e5dfb15.zip | |
Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits
Diffstat (limited to 'ui/app/conf-tx.js')
| -rw-r--r-- | ui/app/conf-tx.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index 0a59eee37..ed633553b 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -13,6 +13,7 @@ const BN = ethUtil.BN const PendingTx = require('./components/pending-tx') const PendingMsg = require('./components/pending-msg') const PendingPersonalMsg = require('./components/pending-personal-msg') +const Loading = require('./components/loading') module.exports = connect(mapStateToProps)(ConfirmTxScreen) @@ -48,7 +49,7 @@ ConfirmTxScreen.prototype.render = function () { var isNotification = isPopupOrNotification() === 'notification' log.info(`rendering a combined ${unconfTxList.length} unconf msg & txs`) - if (unconfTxList.length === 0) return null + if (unconfTxList.length === 0) return h(Loading) return ( |