diff options
author | Dan <danjm.com@gmail.com> | 2018-03-30 06:46:45 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-03-30 06:46:45 +0800 |
commit | ad603da2e72fbc64733836e1b3626627de81fa76 (patch) | |
tree | e5dec131e3127b3e7f6330792bca65b7edc30d52 /ui/app | |
parent | 949ac352de33fb8daf9ae4ea240e201cc25418c0 (diff) | |
download | dexon-wallet-ad603da2e72fbc64733836e1b3626627de81fa76.tar.gz dexon-wallet-ad603da2e72fbc64733836e1b3626627de81fa76.tar.zst dexon-wallet-ad603da2e72fbc64733836e1b3626627de81fa76.zip |
Stopping wrapping provider children in div; stop wrapping old-ui in provider.
Diffstat (limited to 'ui/app')
-rw-r--r-- | ui/app/i18n-provider.js | 3 | ||||
-rw-r--r-- | ui/app/root.js | 3 | ||||
-rw-r--r-- | ui/app/select-app.js | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/ui/app/i18n-provider.js b/ui/app/i18n-provider.js index 57482985..fe6d62c6 100644 --- a/ui/app/i18n-provider.js +++ b/ui/app/i18n-provider.js @@ -1,6 +1,5 @@ const { Component } = require('react') const connect = require('react-redux').connect -const h = require('react-hyperscript') const PropTypes = require('prop-types') const t = require('../i18n-helper').getMessage @@ -13,7 +12,7 @@ class I18nProvider extends Component { } render() { - return h('div', [ this.props.children ]) + return this.props.children } } diff --git a/ui/app/root.js b/ui/app/root.js index 58605a3d..21d6d182 100644 --- a/ui/app/root.js +++ b/ui/app/root.js @@ -3,7 +3,6 @@ const Component = require('react').Component const Provider = require('react-redux').Provider const h = require('react-hyperscript') const SelectedApp = require('./select-app') -const I18nProvider = require('./i18n-provider') module.exports = Root @@ -16,7 +15,7 @@ Root.prototype.render = function () { h(Provider, { store: this.props.store, }, [ - h(I18nProvider, [ h(SelectedApp) ]), + h(SelectedApp), ]) ) diff --git a/ui/app/select-app.js b/ui/app/select-app.js index 193c9835..101eb1cf 100644 --- a/ui/app/select-app.js +++ b/ui/app/select-app.js @@ -7,6 +7,7 @@ const OldApp = require('../../old-ui/app/app') const { autoAddToBetaUI } = require('./selectors') const { setFeatureFlag, setNetworkEndpoints } = require('./actions') const { BETA_UI_NETWORK_TYPE } = require('../../app/scripts/config').enums +const I18nProvider = require('./i18n-provider') function mapStateToProps (state) { return { @@ -62,7 +63,7 @@ SelectedApp.prototype.render = function () { // const Selected = betaUI || isMascara || firstTime ? App : OldApp const { betaUI, isMascara } = this.props - const Selected = betaUI || isMascara ? App : OldApp + const Selected = betaUI || isMascara ? h(I18nProvider, [ h(App) ]) : h(OldApp) - return h(Selected) + return Selected } |