1 files changed, 46 insertions, 4 deletions

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 0b69f7514..835fd394b 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -9,6 +9,7 @@ import Button from '../../ui/Button';
 import Toggle from '../../ui/Toggle';
 import Select from '../../ui/Select';
 import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
+import Input from '../../ui/Input';
 
 import { FRANZ_TRANSLATION } from '../../../config';
 
@@ -21,6 +22,14 @@ const messages = defineMessages({
     id: 'settings.app.headlineGeneral',
     defaultMessage: '!!!General',
   },
+  serverInfo: {
+    id: 'settings.app.serverInfo',
+    defaultMessage: '!!!We advice you to logout after changing your server as your settings might not be saved otherwise.',
+  },
+  todoServerInfo: {
+    id: 'settings.app.todoServerInfo',
+    defaultMessage: '!!!This server will be used for the "Franz Todo" feature. The default server will only work for premium users. (default: https://app.franztodos.com)',
+  },
   headlineLanguage: {
     id: 'settings.app.headlineLanguage',
     defaultMessage: '!!!Language',
@@ -39,7 +48,7 @@ const messages = defineMessages({
   },
   translationHelp: {
     id: 'settings.app.translationHelp',
-    defaultMessage: '!!!Help us to translate Franz into your language.',
+    defaultMessage: '!!!Help us to translate Ferdi into your language.',
   },
   subheadlineCache: {
     id: 'settings.app.subheadlineCache',
@@ -47,7 +56,7 @@ const messages = defineMessages({
   },
   cacheInfo: {
     id: 'settings.app.cacheInfo',
-    defaultMessage: '!!!Franz cache is currently using {size} of disk space.',
+    defaultMessage: '!!!Ferdi cache is currently using {size} of disk space.',
   },
   buttonClearAllCache: {
     id: 'settings.app.buttonClearAllCache',
@@ -71,7 +80,7 @@ const messages = defineMessages({
   },
   updateStatusUpToDate: {
     id: 'settings.app.updateStatusUpToDate',
-    defaultMessage: '!!!You are using the latest version of Franz',
+    defaultMessage: '!!!You are using the latest version of Ferdi',
   },
   currentVersion: {
     id: 'settings.app.currentVersion',
@@ -147,6 +156,8 @@ export default @observer class EditSettingsForm extends Component {
       updateButtonLabelMessage = messages.buttonSearchForUpdate;
     }
 
+    const isLoggedIn = Boolean(localStorage.getItem('authToken'));
+
     return (
       <div className="settings__main">
         <div className="settings__header">
@@ -163,14 +174,33 @@ export default @observer class EditSettingsForm extends Component {
             <Toggle field={form.$('autoLaunchOnStart')} />
             <Toggle field={form.$('runInBackground')} />
             <Toggle field={form.$('enableSystemTray')} />
+            <Toggle field={form.$('privateNotifications')} />
             {process.platform === 'win32' && (
               <Toggle field={form.$('minimizeToSystemTray')} />
             )}
+            <Input
+              placeholder="Server"
+              onChange={e => this.submit(e)}
+              field={form.$('server')}
+              autoFocus
+            />
+            {isLoggedIn && (
+              <p>{ intl.formatMessage(messages.serverInfo) }</p>
+            )}
             {isWorkspaceEnabled && (
               <Toggle field={form.$('keepAllWorkspacesLoaded')} />
             )}
             {isTodosEnabled && (
-              <Toggle field={form.$('enableTodos')} />
+              <>
+                <Toggle field={form.$('enableTodos')} />
+                <Input
+                  placeholder="Todo Server"
+                  onChange={e => this.submit(e)}
+                  field={form.$('todoServer')}
+                  autoFocus
+                />
+                <p>{ intl.formatMessage(messages.todoServerInfo) }</p>
+              </>
             )}
 
             {/* Appearance */}
@@ -257,6 +287,18 @@ export default @observer class EditSettingsForm extends Component {
               <span className="mdi mdi-information" />
               {intl.formatMessage(messages.languageDisclaimer)}
             </p>
+            <p className="settings__message">
+              <span className="mdi mdi-github-face" />
+              <span>
+                Ferdi is based on
+                {' '}
+                <a href="https://github.com/meetfranz/franz" target="_blank">Franz</a>
+                , a project published
+                under the
+                {' '}
+                <a href="https://github.com/meetfranz/franz/blob/master/LICENSE" target="_blank">Apache-2.0 License</a>
+              </span>
+            </p>
           </form>
         </div>
       </div>