aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/conf-tx.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-03-01 04:00:07 +0800
committerDan Finlay <dan@danfinlay.com>2017-03-01 04:00:07 +0800
commit2e16e1eb94d0ec68da74d3ee4ce1c9ac2115c13d (patch)
tree49660f00a9a9dbbd175125237a876a280e00f4a3 /ui/app/conf-tx.js
parent45138af6c6b97f795bac954ffb1229a3569591bc (diff)
downloadtangerine-wallet-browser-2e16e1eb94d0ec68da74d3ee4ce1c9ac2115c13d.tar.gz
tangerine-wallet-browser-2e16e1eb94d0ec68da74d3ee4ce1c9ac2115c13d.tar.zst
tangerine-wallet-browser-2e16e1eb94d0ec68da74d3ee4ce1c9ac2115c13d.zip
Fixed bug that made send screen sometimes transition to account detail
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r--ui/app/conf-tx.js3
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 (