aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/main-container.js
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2017-11-08 01:29:47 +0800
committerfrankiebee <frankie.diamond@gmail.com>2017-11-08 01:29:47 +0800
commit08867874ccea02dab9755ba6b0fc4221bb1dbf00 (patch)
tree5b2b893c4c00a14daa9724ba28ff7dc8f504ea10 /ui/app/main-container.js
parenta89b682dec350218b2d753d6cfb196f965acdde2 (diff)
parentacc973d543ac65f8db980c0007c248c509345411 (diff)
downloadtangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.tar.gz
tangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.tar.zst
tangerine-wallet-browser-08867874ccea02dab9755ba6b0fc4221bb1dbf00.zip
Merge remote-tracking branch 'origin/uat' into mascara-first-screen
Diffstat (limited to 'ui/app/main-container.js')
-rw-r--r--ui/app/main-container.js6
1 files changed, 1 insertions, 5 deletions
diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index 6e2342c2b..031f61e84 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -37,11 +37,7 @@ MainContainer.prototype.render = function () {
break
case 'config':
log.debug('rendering config screen from unlock screen.')
- contents = {
- component: Settings,
- key: 'config',
- }
- break
+ return h(Settings, {key: 'config'})
default:
log.debug('rendering locked screen')
contents = {