aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2017-11-15 00:04:55 +0800
committerDan <danjm.com@gmail.com>2017-12-05 10:38:23 +0800
commit7f795240706c013dc4a9ece0e9c9e33897c7fc71 (patch)
tree631ca16db8ea6d5efd2e57f4c25699e3482512ca /ui/app/app.js
parent6561e75aa2fb03c77544da3c090ad6ea2883d29a (diff)
downloadtangerine-wallet-browser-7f795240706c013dc4a9ece0e9c9e33897c7fc71.tar
tangerine-wallet-browser-7f795240706c013dc4a9ece0e9c9e33897c7fc71.tar.gz
tangerine-wallet-browser-7f795240706c013dc4a9ece0e9c9e33897c7fc71.tar.bz2
tangerine-wallet-browser-7f795240706c013dc4a9ece0e9c9e33897c7fc71.tar.lz
tangerine-wallet-browser-7f795240706c013dc4a9ece0e9c9e33897c7fc71.tar.xz
tangerine-wallet-browser-7f795240706c013dc4a9ece0e9c9e33897c7fc71.tar.zst
tangerine-wallet-browser-7f795240706c013dc4a9ece0e9c9e33897c7fc71.zip
Add UI selection
Diffstat (limited to 'ui/app/app.js')
-rw-r--r--ui/app/app.js60
1 files changed, 34 insertions, 26 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index e90c3e98e..7e1eb200f 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(),
+ ])
])
)
}
@@ -268,6 +269,13 @@ App.prototype.renderAppBar = function () {
},
}, 'MetaMask'),
+ h('span', {
+ style: {},
+ onClick: () => {
+ props.dispatch(actions.setFeatureFlag('betaUI', false))
+ },
+ }, 'Leave Beta')
+
]),
h('div.header__right-actions', [