Merge tag 'v4.5.5'

# Conflicts:
#	app/_locales/ja/messages.json
#	package-lock.json

messages.jsonのローカライズ

1 files changed, 3 insertions, 2 deletions

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
 }