diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2018-04-20 02:49:11 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2018-04-20 02:49:11 +0800 |
| commit | c20c97ce625207c7afcd48a12f6e7891d582ae99 (patch) | |
| tree | b5e063ee7cfd0d0e99fcdb0409fe3106c010bf79 /ui/app/main-container.js | |
| parent | eeb9390de81ce6fc92247d5c499e991dce8330bd (diff) | |
| parent | 00efcf9e8ba34d448b628c98d32ad12d5be2ffc9 (diff) | |
| download | tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar.gz tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar.bz2 tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar.lz tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar.xz tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar.zst tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.zip | |
Merge branch 'master' into tx-controller-rewrite-v3
Diffstat (limited to 'ui/app/main-container.js')
| -rw-r--r-- | ui/app/main-container.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/app/main-container.js b/ui/app/main-container.js index eed4bd164..c305687ea 100644 --- a/ui/app/main-container.js +++ b/ui/app/main-container.js @@ -2,8 +2,9 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits const AccountAndTransactionDetails = require('./account-and-transaction-details') -const Settings = require('./settings') -const UnlockScreen = require('./unlock') +const Settings = require('./components/pages/settings') +const UnlockScreen = require('./components/pages/unlock') +const log = require('loglevel') module.exports = MainContainer |