diff options
author | Dan <danjm.com@gmail.com> | 2018-04-10 03:22:26 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-04-10 03:22:26 +0800 |
commit | 2c4426e4de745be880a994674dc1dc74c7ec74eb (patch) | |
tree | 1de9b836026d3222b490793099b66372404b83ab /ui/app/select-app.js | |
parent | 9dbb9d12ad31d53b8911db171cb7d6b3fcb477e2 (diff) | |
parent | 4cae3d3b0d2a9cc0279e44de256e7fc7e219dca1 (diff) | |
download | tangerine-wallet-browser-2c4426e4de745be880a994674dc1dc74c7ec74eb.tar.gz tangerine-wallet-browser-2c4426e4de745be880a994674dc1dc74c7ec74eb.tar.zst tangerine-wallet-browser-2c4426e4de745be880a994674dc1dc74c7ec74eb.zip |
Merge branch 'master' into i3580-InternationalizeCurrency
Diffstat (limited to 'ui/app/select-app.js')
-rw-r--r-- | ui/app/select-app.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ui/app/select-app.js b/ui/app/select-app.js index 101eb1cf6..d1565e2fb 100644 --- a/ui/app/select-app.js +++ b/ui/app/select-app.js @@ -2,6 +2,7 @@ const inherits = require('util').inherits const Component = require('react').Component const connect = require('react-redux').connect const h = require('react-hyperscript') +const { HashRouter } = require('react-router-dom') const App = require('./app') const OldApp = require('../../old-ui/app/app') const { autoAddToBetaUI } = require('./selectors') @@ -63,7 +64,12 @@ SelectedApp.prototype.render = function () { // const Selected = betaUI || isMascara || firstTime ? App : OldApp const { betaUI, isMascara } = this.props - const Selected = betaUI || isMascara ? h(I18nProvider, [ h(App) ]) : h(OldApp) - return Selected + return betaUI || isMascara + ? h(HashRouter, { + hashType: 'noslash', + }, [ + h(I18nProvider, [ h(App) ]), + ]) + : h(OldApp) } |