1 files changed, 9 insertions, 6 deletions

diff --git a/src/app.js b/src/app.js
index cb3e37c64..1c2f66592 100644
--- a/src/app.js
+++ b/src/app.js
@@ -18,7 +18,6 @@ import apiFactory from './api';
 import actions from './actions';
 import MenuFactory from './lib/Menu';
 import TouchBarFactory from './lib/TouchBar';
-import * as analytics from './lib/analytics';
 
 import I18N from './I18n';
 import AppLayoutContainer from './containers/layout/AppLayoutContainer';
@@ -31,8 +30,10 @@ import TeamScreen from './containers/settings/TeamScreen';
 import EditUserScreen from './containers/settings/EditUserScreen';
 import EditSettingsScreen from './containers/settings/EditSettingsScreen';
 import InviteSettingsScreen from './containers/settings/InviteScreen';
+import SupportFerdiScreen from './containers/settings/SupportScreen';
 import WelcomeScreen from './containers/auth/WelcomeScreen';
 import LoginScreen from './containers/auth/LoginScreen';
+import LockedScreen from './containers/auth/LockedScreen';
 import PasswordScreen from './containers/auth/PasswordScreen';
 import SignupScreen from './containers/auth/SignupScreen';
 import ImportScreen from './containers/auth/ImportScreen';
@@ -54,20 +55,20 @@ webFrame.setVisualZoomLevelLimits(1, 1);
 webFrame.setLayoutZoomLevelLimits(0, 0);
 
 window.addEventListener('load', () => {
-  const api = apiFactory(new ServerApi(), new LocalApi());
+  const serverApi = new ServerApi();
+  const api = apiFactory(serverApi, new LocalApi());
   const router = new RouterStore();
-  const history = syncHistoryWithStore(hashHistory, router);
   const stores = storeFactory(api, actions, router);
+  const history = syncHistoryWithStore(hashHistory, router);
   const menu = new MenuFactory(stores, actions);
   const touchBar = new TouchBarFactory(stores, actions);
 
-  window.franz = {
+  window.ferdi = {
     stores,
     actions,
     api,
     menu,
     touchBar,
-    analytics,
     features: {},
     render() {
       const preparedApp = (
@@ -89,12 +90,14 @@ window.addEventListener('load', () => {
                   <Route path="/settings/team" component={TeamScreen} />
                   <Route path="/settings/app" component={EditSettingsScreen} />
                   <Route path="/settings/invite" component={InviteSettingsScreen} />
+                  <Route path="/settings/support" component={SupportFerdiScreen} />
                 </Route>
               </Route>
               <Route path="/auth" component={AuthLayoutContainer}>
                 <IndexRedirect to="/auth/welcome" />
                 <Route path="/auth/welcome" component={WelcomeScreen} />
                 <Route path="/auth/login" component={LoginScreen} />
+                <Route path="/auth/locked" component={LockedScreen} />
                 <Route path="/auth/signup">
                   <IndexRedirect to="/auth/signup/form" />
                   <Route path="/auth/signup/form" component={SignupScreen} />
@@ -114,7 +117,7 @@ window.addEventListener('load', () => {
       render(preparedApp, document.getElementById('root'));
     },
   };
-  window.franz.render();
+  window.ferdi.render();
 });
 
 // Prevent drag and drop into window from redirecting