diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-07-13 00:54:08 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-07-13 00:54:08 +0800 |
commit | 07d8bfaec51a798e090bd2521debeddaf53bf2f9 (patch) | |
tree | 735338e1dbaa38601376024ed6e4fa4d89c66a2c /ui/app/main-container.js | |
parent | 2a0a7853249284cb27831890f3b62847ea27eb83 (diff) | |
parent | 0d4dbbec2abfa8c8015063d6e4a5ff0d34abe7b9 (diff) | |
download | tangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.tar tangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.tar.gz tangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.tar.bz2 tangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.tar.lz tangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.tar.xz tangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.tar.zst tangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.zip |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support
Diffstat (limited to 'ui/app/main-container.js')
-rw-r--r-- | ui/app/main-container.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/app/main-container.js b/ui/app/main-container.js index b49a52363..8a0708025 100644 --- a/ui/app/main-container.js +++ b/ui/app/main-container.js @@ -3,9 +3,10 @@ const h = require('react-hyperscript') const inherits = require('util').inherits const AccountAndTransactionDetails = require('./account-and-transaction-details') const Settings = require('./components/pages/settings') -const UnlockScreen = require('./components/pages/unlock-page') const log = require('loglevel') +import UnlockScreen from './components/pages/unlock-page' + module.exports = MainContainer inherits(MainContainer, Component) |