diff options
| author | Bruno <brunobar79@gmail.com> | 2018-05-17 10:38:51 +0800 |
|---|---|---|
| committer | Bruno <brunobar79@gmail.com> | 2018-05-17 10:38:51 +0800 |
| commit | 3dd58463caef98c2cc1f068931624795a43912db (patch) | |
| tree | b49a2e4feffd33e3b96d43ec29f2ca1071912e67 /ui/app/conf-tx.js | |
| parent | 3180b69b974f8ffc0d6546a647725d1bf8539483 (diff) | |
| parent | 708422432c634ffbd4c73388f980c43f766b3355 (diff) | |
| download | tangerine-wallet-browser-3dd58463caef98c2cc1f068931624795a43912db.tar.gz tangerine-wallet-browser-3dd58463caef98c2cc1f068931624795a43912db.tar.zst tangerine-wallet-browser-3dd58463caef98c2cc1f068931624795a43912db.zip | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'ui/app/conf-tx.js')
| -rw-r--r-- | ui/app/conf-tx.js | 2 |
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( |