Merge branch 'master' of https://github.com/meetfranz/franz into meetfranz-master

2 files changed, 6 insertions, 60 deletions

diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js
index 7fe9d354b..d4271dba0 100644
--- a/src/features/todos/components/TodosWebview.js
+++ b/src/features/todos/components/TodosWebview.js
@@ -6,16 +6,11 @@ import Webview from 'react-electron-web-view';
 import { Icon } from '@meetfranz/ui';
 import { defineMessages, intlShape } from 'react-intl';
 
-import { mdiChevronRight, mdiCheckAll } from '@mdi/js';
+import { mdiCheckAll } from '@mdi/js';
 import * as environment from '../../../environment';
 import Appear from '../../../components/ui/effects/Appear';
 import UpgradeButton from '../../../components/ui/UpgradeButton';
 
-import SettingsStore from '../../../stores/SettingsStore';
-
-const OPEN_TODOS_BUTTON_SIZE = 45;
-const CLOSE_TODOS_BUTTON_SIZE = 35;
-
 const messages = defineMessages({
   premiumInfo: {
     id: 'feature.todos.premium.info',
@@ -63,50 +58,6 @@ const styles = theme => ({
     background: theme.todos.dragIndicator.background,
 
   },
-  openTodosButton: {
-    width: OPEN_TODOS_BUTTON_SIZE,
-    height: OPEN_TODOS_BUTTON_SIZE,
-    background: theme.todos.toggleButton.background,
-    position: 'absolute',
-    bottom: 120,
-    right: props => (props.width + (props.isVisible ? -OPEN_TODOS_BUTTON_SIZE / 2 : 0)),
-    borderRadius: OPEN_TODOS_BUTTON_SIZE / 2,
-    opacity: props => (props.isVisible ? 0 : 1),
-    transition: 'right 0.5s',
-    zIndex: 600,
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
-    boxShadow: [0, 0, 10, theme.todos.toggleButton.shadowColor],
-
-    borderTopRightRadius: props => (props.isVisible ? null : 0),
-    borderBottomRightRadius: props => (props.isVisible ? null : 0),
-
-    '& svg': {
-      fill: theme.todos.toggleButton.textColor,
-      transition: 'all 0.5s',
-    },
-  },
-  closeTodosButton: {
-    width: CLOSE_TODOS_BUTTON_SIZE,
-    height: CLOSE_TODOS_BUTTON_SIZE,
-    background: theme.todos.toggleButton.background,
-    position: 'absolute',
-    bottom: 120,
-    right: ({ width }) => (width + -CLOSE_TODOS_BUTTON_SIZE / 2),
-    borderRadius: CLOSE_TODOS_BUTTON_SIZE / 2,
-    opacity: ({ isTodosIncludedInCurrentPlan }) => (!isTodosIncludedInCurrentPlan ? 1 : 0),
-    transition: 'opacity 0.5s',
-    zIndex: 600,
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
-    boxShadow: [0, 0, 10, theme.todos.toggleButton.shadowColor],
-
-    '& svg': {
-      fill: theme.todos.toggleButton.textColor,
-    },
-  },
   premiumContainer: {
     display: 'flex',
     flexDirection: 'column',
@@ -134,7 +85,6 @@ class TodosWebview extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
     isVisible: PropTypes.bool.isRequired,
-    togglePanel: PropTypes.func.isRequired,
     handleClientMessage: PropTypes.func.isRequired,
     setTodosWebview: PropTypes.func.isRequired,
     resize: PropTypes.func.isRequired,
@@ -233,7 +183,6 @@ class TodosWebview extends Component {
     const {
       classes,
       isVisible,
-      togglePanel,
       isTodosIncludedInCurrentPlan,
       stores,
     } = this.props;
@@ -253,13 +202,6 @@ class TodosWebview extends Component {
         onMouseUp={() => this.stopResize()}
         ref={(node) => { this.node = node; }}
       >
-        <button
-          onClick={() => togglePanel()}
-          className={isVisible ? classes.closeTodosButton : classes.openTodosButton}
-          type="button"
-        >
-          <Icon icon={isVisible ? mdiChevronRight : mdiCheckAll} size={2} />
-        </button>
         <div
           className={classes.resizeHandler}
           style={Object.assign({ left: delta }, isDragging ? { width: 600, marginLeft: -200 } : {})} // This hack is required as resizing with webviews beneath behaves quite bad
diff --git a/src/features/todos/store.js b/src/features/todos/store.js
index 70818f9b8..d507237d1 100644
--- a/src/features/todos/store.js
+++ b/src/features/todos/store.js
@@ -33,7 +33,7 @@ export default class TodoStore extends FeatureStore {
 
   @computed get isTodosPanelForceHidden() {
     const { isAnnouncementShown } = this.stores.announcements;
-    return delayAppState.isDelayAppScreenVisible || !this.settings.isFeatureEnabledByUser || isAnnouncementShown;
+    return delayAppState.isDelayAppScreenVisible || !this.isFeatureEnabledByUser || isAnnouncementShown;
   }
 
   @computed get isTodosPanelVisible() {
@@ -41,6 +41,10 @@ export default class TodoStore extends FeatureStore {
     return this.settings.isTodosPanelVisible;
   }
 
+  @computed get isFeatureEnabledByUser() {
+    return this.settings.isFeatureEnabledByUser;
+  }
+
   @computed get settings() {
     return localStorage.getItem('todos') || {};
   }