4 files changed, 45 insertions, 8 deletions

diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index a14a98554..95fbd109f 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -140,6 +140,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
           showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar}
           appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED}
           nextAppReleaseVersion={app.nextAppReleaseVersion}
+          authRequestFailed={app.authRequestFailed}
           sidebar={sidebar}
           workspacesDrawer={workspacesDrawer}
           services={servicesContainer}
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 9c74cf2ab..41cdeb79a 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -26,7 +26,14 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend
   handleWebsiteLink(route) {
     const { actions, stores } = this.props;
 
-    const url = stores.user.getAuthURL(`${WEBSITE}${route}?utm_source=app&utm_medium=account_dashboard`);
+    const api = stores.settings.all.app.server;
+
+    let url;
+    if (api === 'https://api.franzinfra.com') {
+      url = stores.user.getAuthURL(`${WEBSITE}${route}?utm_source=app&utm_medium=account_dashboard`);
+    } else {
+      url = `${api}${route}`;
+    }
 
     actions.app.openExternalUrl({ url });
   }
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 9aba212be..09e7b43ab 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -17,6 +17,8 @@ import { getSelectOptions } from '../../helpers/i18n-helpers';
 import EditSettingsForm from '../../components/settings/settings/EditSettingsForm';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
+import { API, TODOS_FRONTEND } from '../../environment';
+
 import globalMessages from '../../i18n/globalMessages';
 import { DEFAULT_IS_FEATURE_ENABLED_BY_USER } from '../../features/todos';
 import WorkspacesStore from '../../features/workspaces/store';
@@ -25,7 +27,7 @@ import { DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED } from '../../features/works
 const messages = defineMessages({
   autoLaunchOnStart: {
     id: 'settings.app.form.autoLaunchOnStart',
-    defaultMessage: '!!!Launch Franz on start',
+    defaultMessage: '!!!Launch Ferdi on start',
   },
   autoLaunchInBackground: {
     id: 'settings.app.form.autoLaunchInBackground',
@@ -33,15 +35,27 @@ const messages = defineMessages({
   },
   runInBackground: {
     id: 'settings.app.form.runInBackground',
-    defaultMessage: '!!!Keep Franz in background when closing the window',
+    defaultMessage: '!!!Keep Ferdi in background when closing the window',
   },
   enableSystemTray: {
     id: 'settings.app.form.enableSystemTray',
-    defaultMessage: '!!!Show Franz in system tray',
+    defaultMessage: '!!!Show Ferdi in system tray',
   },
   minimizeToSystemTray: {
     id: 'settings.app.form.minimizeToSystemTray',
-    defaultMessage: '!!!Minimize Franz to system tray',
+    defaultMessage: '!!!Minimize Ferdi to system tray',
+  },
+  privateNotifications: {
+    id: 'settings.app.form.privateNotifications',
+    defaultMessage: '!!!Don\'t show message content in notifications',
+  },
+  server: {
+    id: 'settings.app.form.server',
+    defaultMessage: '!!!Server',
+  },
+  todoServer: {
+    id: 'settings.app.form.todoServer',
+    defaultMessage: '!!!Todo Server',
   },
   language: {
     id: 'settings.app.form.language',
@@ -107,6 +121,9 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         runInBackground: settingsData.runInBackground,
         enableSystemTray: settingsData.enableSystemTray,
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
+        privateNotifications: settingsData.privateNotifications,
+        server: settingsData.server,
+        todoServer: settingsData.todoServer,
         enableGPUAcceleration: settingsData.enableGPUAcceleration,
         showDisabledServices: settingsData.showDisabledServices,
         darkMode: settingsData.darkMode,
@@ -182,6 +199,21 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.minimizeToSystemTray,
           default: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
         },
+        privateNotifications: {
+          label: intl.formatMessage(messages.privateNotifications),
+          value: settings.all.app.privateNotifications,
+          default: DEFAULT_APP_SETTINGS.privateNotifications,
+        },
+        server: {
+          label: intl.formatMessage(messages.server),
+          value: settings.all.app.server || API,
+          default: API,
+        },
+        todoServer: {
+          label: intl.formatMessage(messages.todoServer),
+          value: settings.all.app.todoServer || TODOS_FRONTEND,
+          default: TODOS_FRONTEND,
+        },
         showDisabledServices: {
           label: intl.formatMessage(messages.showDisabledServices),
           value: settings.all.app.showDisabledServices,
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index 132820b6f..692dc26f1 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -13,7 +13,6 @@ import UserStore from '../../stores/UserStore';
 import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { FRANZ_DEV_DOCS } from '../../config';
-import { gaEvent } from '../../lib/analytics';
 import { communityRecipesStore } from '../../features/communityRecipes';
 
 const { app } = remote;
@@ -122,11 +121,9 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
           recipeDirectory={recipeDirectory}
           openRecipeDirectory={() => {
             shell.openItem(recipeDirectory);
-            gaEvent('Recipe', 'open-recipe-folder', 'Open Folder');
           }}
           openDevDocs={() => {
             appActions.openExternalUrl({ url: FRANZ_DEV_DOCS });
-            gaEvent('Recipe', 'open-dev-docs', 'Developer Documentation');
           }}
           isCommunityRecipesIncludedInCurrentPlan={communityRecipesStore.isCommunityRecipesIncludedInCurrentPlan}
           isUserPremiumUser={user.isPremium}