Fix delay app ux in combination with announcements

2 files changed, 6 insertions, 3 deletions

diff --git a/src/features/todos/containers/TodosScreen.js b/src/features/todos/containers/TodosScreen.js
index 65afc985b..a5da0b014 100644
--- a/src/features/todos/containers/TodosScreen.js
+++ b/src/features/todos/containers/TodosScreen.js
@@ -11,7 +11,7 @@ import { todoActions } from '../actions';
 @inject('stores', 'actions') @observer
 class TodosScreen extends Component {
   render() {
-    if (!todosStore || !todosStore.isFeatureActive) {
+    if (!todosStore || !todosStore.isFeatureActive || todosStore.isTodosPanelForceHidden) {
       return null;
     }
 
diff --git a/src/features/todos/store.js b/src/features/todos/store.js
index aebe0dcbe..ea05077ab 100644
--- a/src/features/todos/store.js
+++ b/src/features/todos/store.js
@@ -29,10 +29,13 @@ export default class TodoStore extends FeatureStore {
     return width < TODOS_MIN_WIDTH ? TODOS_MIN_WIDTH : width;
   }
 
+  @computed get isTodosPanelForceHidden() {
+    const { isAnnouncementShown } = this.stores.announcements;
+    return delayAppState.isDelayAppScreenVisible || isAnnouncementShown;
+  }
+
   @computed get isTodosPanelVisible() {
-    if (delayAppState.isDelayAppScreenVisible) return false;
     if (this.settings.isTodosPanelVisible === undefined) return DEFAULT_TODOS_VISIBLE;
-
     return this.settings.isTodosPanelVisible;
   }