summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@codeispoetry.ru>2017-06-09 16:27:34 +0300
committerAndrej Mihajlov <and@codeispoetry.ru>2017-06-09 16:27:34 +0300
commit56c25917c793a3c2802d5fbfd53133ec25e62ff9 (patch)
treeb70bf812b9059eb80b19e4ad400e63553794637b
parent0069b8d73328681286776b15a8944bc59b676faa (diff)
parenta446bcf1294f9d9b30e35dcd39068aeebb7fd257 (diff)
downloadmullvadvpn-56c25917c793a3c2802d5fbfd53133ec25e62ff9.tar.xz
mullvadvpn-56c25917c793a3c2802d5fbfd53133ec25e62ff9.zip
Merge branch 'hotfix/window-chrome-merge-issue'
-rw-r--r--app/routes.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/routes.js b/app/routes.js
index a85e5efbda..e61782f5f1 100644
--- a/app/routes.js
+++ b/app/routes.js
@@ -1,7 +1,7 @@
import React from 'react';
import { Switch, Route, Redirect } from 'react-router';
import { CSSTransitionGroup } from 'react-transition-group';
-import Chrome from './components/Chrome';
+import WindowChrome from './components/WindowChrome';
import LoginPage from './containers/LoginPage';
import ConnectPage from './containers/ConnectPage';
import SettingsPage from './containers/SettingsPage';
@@ -98,7 +98,7 @@ export default function makeRoutes(getState, componentProps) {
previousRoute = toRoute;
return (
- <Chrome>
+ <WindowChrome>
<CSSTransitionGroup component="div" className="transition-container" { ...transitionProps }>
<Switch key={ location.key } location={ location }>
<LoginRoute exact path="/" component={ LoginPage } />
@@ -108,7 +108,7 @@ export default function makeRoutes(getState, componentProps) {
<PrivateRoute path="/select-location" component={ SelectLocationPage } />
</Switch>
</CSSTransitionGroup>
- </Chrome>
+ </WindowChrome>
);
}} />
);