5 files changed, 14 insertions, 8 deletions

diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js
index f24c0b044..35c102220 100644
--- a/src/features/todos/components/TodosWebview.js
+++ b/src/features/todos/components/TodosWebview.js
@@ -1,12 +1,14 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { observer } from 'mobx-react';
+import { observer, inject } from 'mobx-react';
 import injectSheet from 'react-jss';
 import Webview from 'react-electron-web-view';
 import { Icon } from '@meetfranz/ui';
 import { defineMessages, intlShape } from 'react-intl';
 
 import { mdiCheckAll } from '@mdi/js';
+import SettingsStore from '../../../stores/SettingsStore';
+
 import * as environment from '../../../environment';
 import Appear from '../../../components/ui/effects/Appear';
 import UpgradeButton from '../../../components/ui/UpgradeButton';
@@ -77,7 +79,7 @@ const styles = theme => ({
   },
 });
 
-@injectSheet(styles) @observer
+@injectSheet(styles) @observer @inject('stores')
 class TodosWebview extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -88,6 +90,9 @@ class TodosWebview extends Component {
     width: PropTypes.number.isRequired,
     minWidth: PropTypes.number.isRequired,
     isTodosIncludedInCurrentPlan: PropTypes.bool.isRequired,
+    stores: PropTypes.shape({
+      settings: PropTypes.instanceOf(SettingsStore).isRequired,
+    }).isRequired,
   };
 
   state = {
@@ -178,6 +183,7 @@ class TodosWebview extends Component {
       classes,
       isVisible,
       isTodosIncludedInCurrentPlan,
+      stores,
     } = this.props;
 
     const {
@@ -217,7 +223,7 @@ class TodosWebview extends Component {
             partition="persist:todos"
             preload="./features/todos/preload.js"
             ref={(webview) => { this.webview = webview ? webview.view : null; }}
-            src={environment.TODOS_FRONTEND}
+            src={stores.settings.all.app.todoServer || environment.TODOS_FRONTEND}
           />
         ) : (
           <Appear>
diff --git a/src/features/todos/containers/TodosScreen.js b/src/features/todos/containers/TodosScreen.js
index a5da0b014..bc05a587d 100644
--- a/src/features/todos/containers/TodosScreen.js
+++ b/src/features/todos/containers/TodosScreen.js
@@ -25,7 +25,7 @@ class TodosScreen extends Component {
           width={todosStore.width}
           minWidth={TODOS_MIN_WIDTH}
           resize={width => todoActions.resize({ width })}
-          isTodosIncludedInCurrentPlan={this.props.stores.features.features.isTodosIncludedInCurrentPlan || false}
+          isTodosIncludedInCurrentPlan
         />
       </ErrorBoundary>
     );
diff --git a/src/features/todos/index.js b/src/features/todos/index.js
index 7388aebaf..9f355e9ba 100644
--- a/src/features/todos/index.js
+++ b/src/features/todos/index.js
@@ -1,7 +1,7 @@
 import { reaction } from 'mobx';
 import TodoStore from './store';
 
-const debug = require('debug')('Franz:feature:todos');
+const debug = require('debug')('Ferdi:feature:todos');
 
 export const GA_CATEGORY_TODOS = 'Todos';
 
diff --git a/src/features/todos/preload.js b/src/features/todos/preload.js
index 6e38a2ef3..d1838e0d6 100644
--- a/src/features/todos/preload.js
+++ b/src/features/todos/preload.js
@@ -1,13 +1,13 @@
 import { ipcRenderer } from 'electron';
 import { IPC } from './constants';
 
-const debug = require('debug')('Franz:feature:todos:preload');
+const debug = require('debug')('Ferdi:feature:todos:preload');
 
 debug('Preloading Todos Webview');
 
 let hostMessageListener = () => {};
 
-window.franz = {
+window.ferdi = {
   onInitialize(ipcHostMessageListener) {
     hostMessageListener = ipcHostMessageListener;
     ipcRenderer.sendToHost(IPC.TODOS_CLIENT_CHANNEL, { action: 'todos:initialized' });
diff --git a/src/features/todos/store.js b/src/features/todos/store.js
index 4480b2545..a05203a04 100644
--- a/src/features/todos/store.js
+++ b/src/features/todos/store.js
@@ -16,7 +16,7 @@ import {
 import { IPC } from './constants';
 import { state as delayAppState } from '../delayApp';
 
-const debug = require('debug')('Franz:feature:todos:store');
+const debug = require('debug')('Ferdi:feature:todos:store');
 
 export default class TodoStore extends FeatureStore {
   @observable isFeatureEnabled = false;