aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/select-app.js
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2018-03-30 10:28:45 +0800
committerDan <danjm.com@gmail.com>2018-03-30 10:28:45 +0800
commit893f82491d549c9d61dfa1fb30ae1954c4efab68 (patch)
tree3c73dd4c565c773341a44ddfd8d23101d31d4ad3 /ui/app/select-app.js
parenta4594f6838a9ff38a9a6f1998850b27beebb2fbb (diff)
parent9d4be1842e7c56e3bfde529ff555dcae8dec3dbd (diff)
downloadtangerine-wallet-browser-893f82491d549c9d61dfa1fb30ae1954c4efab68.tar
tangerine-wallet-browser-893f82491d549c9d61dfa1fb30ae1954c4efab68.tar.gz
tangerine-wallet-browser-893f82491d549c9d61dfa1fb30ae1954c4efab68.tar.bz2
tangerine-wallet-browser-893f82491d549c9d61dfa1fb30ae1954c4efab68.tar.lz
tangerine-wallet-browser-893f82491d549c9d61dfa1fb30ae1954c4efab68.tar.xz
tangerine-wallet-browser-893f82491d549c9d61dfa1fb30ae1954c4efab68.tar.zst
tangerine-wallet-browser-893f82491d549c9d61dfa1fb30ae1954c4efab68.zip
Merge branch 'master' into i3471-checkbalanceonconfirmscreen
Diffstat (limited to 'ui/app/select-app.js')
-rw-r--r--ui/app/select-app.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/app/select-app.js b/ui/app/select-app.js
index fca3decce..101eb1cf6 100644
--- a/ui/app/select-app.js
+++ b/ui/app/select-app.js
@@ -1,12 +1,13 @@
const inherits = require('util').inherits
const Component = require('react').Component
-const connect = require('./metamask-connect')
+const connect = require('react-redux').connect
const h = require('react-hyperscript')
const App = require('./app')
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
}