From f78d1b812d2e5f48f0a33fe06827761aeb72e7cc Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 16 Jul 2020 20:06:12 +0300
Subject: [PATCH] Bug: filter close is broken when always show is enabled

---
 lib/ui/app/view_scaffold.dart | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/ui/app/view_scaffold.dart b/lib/ui/app/view_scaffold.dart
index 94e46729b..1395c4765 100644
--- a/lib/ui/app/view_scaffold.dart
+++ b/lib/ui/app/view_scaffold.dart
@@ -51,8 +51,16 @@ class ViewScaffold extends StatelessWidget {
           entity.entityType == state.uiState.filterEntityType) {
         leading = IconButton(
           icon: Icon(Icons.clear),
-          onPressed: () =>
-              store.dispatch(UserPreferencesChanged(showFilterSidebar: false)),
+          onPressed: () {
+            if (state.prefState.alwaysShowFilterSidebar) {
+              store.dispatch(FilterByEntity(
+                entityType: state.uiState.filterEntityType,
+                entityId: state.uiState.filterEntityId,
+              ));
+            } else {
+              store.dispatch(UserPreferencesChanged(showFilterSidebar: false));
+            }
+          },
         );
       } else if (isSettings) {
         leading = IconButton(