diff options
author | Chi Kei Chan <chikeichan@gmail.com> | 2017-12-08 01:47:31 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-08 01:47:31 +0800 |
commit | e0d0e19c925224bddf56a4088fb9c402d995d79f (patch) | |
tree | f6306a17629d68e217488ab15af7ce5029c07335 /ui/app/app.js | |
parent | 2e9137dddd4abd07cc45caa670f09bdc9559bbbb (diff) | |
parent | efa894a0c3af0b8182b639c25b4c249b083009cf (diff) | |
download | tangerine-wallet-browser-e0d0e19c925224bddf56a4088fb9c402d995d79f.tar.gz tangerine-wallet-browser-e0d0e19c925224bddf56a4088fb9c402d995d79f.tar.zst tangerine-wallet-browser-e0d0e19c925224bddf56a4088fb9c402d995d79f.zip |
Merge pull request #2697 from danjm/MM-333-auto-add-users-to-new-UI
[NewUI] Auto add users to new ui
Diffstat (limited to 'ui/app/app.js')
-rw-r--r-- | ui/app/app.js | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index e90c3e98e..88a5c8458 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -116,40 +116,41 @@ App.prototype.render = function () { log.debug('Main ui render function') return ( + h('.new-ui', [ + h('.flex-column.full-height', { + style: { + overflowX: 'hidden', + position: 'relative', + alignItems: 'center', + }, + }, [ - h('.flex-column.full-height', { - style: { - overflowX: 'hidden', - position: 'relative', - alignItems: 'center', - }, - }, [ - - // global modal - h(Modal, {}, []), + // global modal + h(Modal, {}, []), - // app bar - this.renderAppBar(), + // app bar + this.renderAppBar(), - // sidebar - this.renderSidebar(), + // sidebar + this.renderSidebar(), - // network dropdown - h(NetworkDropdown, { - provider: this.props.provider, - frequentRpcList: this.props.frequentRpcList, - }, []), + // network dropdown + h(NetworkDropdown, { + provider: this.props.provider, + frequentRpcList: this.props.frequentRpcList, + }, []), - h(AccountMenu), + h(AccountMenu), - (isLoading || isLoadingNetwork) && h(Loading, { - loadingMessage: loadMessage, - }), + (isLoading || isLoadingNetwork) && h(Loading, { + loadingMessage: loadMessage, + }), - // this.renderLoadingIndicator({ isLoading, isLoadingNetwork, loadMessage }), + // this.renderLoadingIndicator({ isLoading, isLoadingNetwork, loadMessage }), - // content - this.renderPrimary(), + // content + this.renderPrimary(), + ]), ]) ) } |