Stopping wrapping provider children in div; stop wrapping old-ui in provider.

3 files changed, 5 insertions, 6 deletions

diff --git a/ui/app/i18n-provider.js b/ui/app/i18n-provider.js
index 57482985d..fe6d62c67 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 58605a3d2..21d6d1829 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 193c98353..101eb1cf6 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
 }