diff options
author | kumavis <kumavis@users.noreply.github.com> | 2018-03-30 07:52:52 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-30 07:52:52 +0800 |
commit | 9d4be1842e7c56e3bfde529ff555dcae8dec3dbd (patch) | |
tree | 6d52709412f407389b58ec15923fe0794f093dcf /ui/app/select-app.js | |
parent | 5a0523cdfd50dcd4e5680134346ccfcb4bb7cbf4 (diff) | |
parent | 74f13c0a34494ab9c96db8772ea2b443ede0835b (diff) | |
download | tangerine-wallet-browser-9d4be1842e7c56e3bfde529ff555dcae8dec3dbd.tar tangerine-wallet-browser-9d4be1842e7c56e3bfde529ff555dcae8dec3dbd.tar.gz tangerine-wallet-browser-9d4be1842e7c56e3bfde529ff555dcae8dec3dbd.tar.bz2 tangerine-wallet-browser-9d4be1842e7c56e3bfde529ff555dcae8dec3dbd.tar.lz tangerine-wallet-browser-9d4be1842e7c56e3bfde529ff555dcae8dec3dbd.tar.xz tangerine-wallet-browser-9d4be1842e7c56e3bfde529ff555dcae8dec3dbd.tar.zst tangerine-wallet-browser-9d4be1842e7c56e3bfde529ff555dcae8dec3dbd.zip |
Merge pull request #3788 from danjm/i3787-make-t-available-via-context
i18n - Removes t from props via metamask-connect; put t on context
Diffstat (limited to 'ui/app/select-app.js')
-rw-r--r-- | ui/app/select-app.js | 7 |
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 } |