diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-10-26 10:46:42 +0800 |
|---|---|---|
| committer | Chi Kei Chan <chikeichan@gmail.com> | 2017-10-26 10:46:42 +0800 |
| commit | db5326dfc288015a4d9f792653a71fd4d7abca33 (patch) | |
| tree | cb93f52f999816d07a6146274093aaebdb7ed8d3 /ui/app/main-container.js | |
| parent | a9a841ba01f6bffa29a3e0491e3a88f6aff72ac7 (diff) | |
| parent | b2e440e4ffba6db29cf8a928a41534c1f204d485 (diff) | |
| download | tangerine-wallet-browser-db5326dfc288015a4d9f792653a71fd4d7abca33.tar tangerine-wallet-browser-db5326dfc288015a4d9f792653a71fd4d7abca33.tar.gz tangerine-wallet-browser-db5326dfc288015a4d9f792653a71fd4d7abca33.tar.bz2 tangerine-wallet-browser-db5326dfc288015a4d9f792653a71fd4d7abca33.tar.lz tangerine-wallet-browser-db5326dfc288015a4d9f792653a71fd4d7abca33.tar.xz tangerine-wallet-browser-db5326dfc288015a4d9f792653a71fd4d7abca33.tar.zst tangerine-wallet-browser-db5326dfc288015a4d9f792653a71fd4d7abca33.zip | |
Merge branch 'NewUI-flat' into uat
Diffstat (limited to 'ui/app/main-container.js')
| -rw-r--r-- | ui/app/main-container.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/main-container.js b/ui/app/main-container.js index eaaff8517..6e2342c2b 100644 --- a/ui/app/main-container.js +++ b/ui/app/main-container.js @@ -3,7 +3,7 @@ const h = require('react-hyperscript') const inherits = require('util').inherits const AccountAndTransactionDetails = require('./account-and-transaction-details') const HDRestoreVaultScreen = require('./keychains/hd/restore-vault') -const ConfigScreen = require('./config') +const Settings = require('./settings') const UnlockScreen = require('./unlock') module.exports = MainContainer @@ -38,7 +38,7 @@ MainContainer.prototype.render = function () { case 'config': log.debug('rendering config screen from unlock screen.') contents = { - component: ConfigScreen, + component: Settings, key: 'config', } break |