aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/conf-tx.js
diff options
context:
space:
mode:
authorThomas <thomas.b.huang@gmail.com>2018-05-04 05:10:26 +0800
committerThomas <thomas.b.huang@gmail.com>2018-05-04 05:10:26 +0800
commitf900821a425ce97695034b3445effe1bbaf4a9a5 (patch)
treef426762d58f31b3c527491e7e8ba25dd11936f3a /ui/app/conf-tx.js
parent9bba97a676b47667abdd7b020cebd56a0f3b96c7 (diff)
parent096851d091385ee786ab1374e83aaf6a1aa7cbce (diff)
downloadtangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.tar.gz
tangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.tar.zst
tangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.zip
Merge branch 'develop' into e2e-tests
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r--ui/app/conf-tx.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index b71538e31..fb38aaa76 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -13,7 +13,7 @@ const SignatureRequest = require('./components/signature-request')
// const PendingMsg = require('./components/pending-msg')
// const PendingPersonalMsg = require('./components/pending-personal-msg')
// const PendingTypedMsg = require('./components/pending-typed-msg')
-const Loading = require('./components/loading')
+const Loading = require('./components/loading-screen')
const { DEFAULT_ROUTE } = require('./routes')
module.exports = compose(