From f10f3d30fe8ca39f51dc8cfa8f5850882a31b8ff Mon Sep 17 00:00:00 2001
From: unknown <hillelcoren@gmail.com>
Date: Mon, 6 Aug 2018 17:21:39 +0300
Subject: [PATCH] Company search

---
 lib/redux/ui/ui_reducer.dart         |  1 -
 lib/ui/app/list_filter.dart          | 10 +++++++---
 lib/ui/dashboard/dashboard_view.dart |  2 --
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/redux/ui/ui_reducer.dart b/lib/redux/ui/ui_reducer.dart
index ddd81b976..31dbbc06a 100644
--- a/lib/redux/ui/ui_reducer.dart
+++ b/lib/redux/ui/ui_reducer.dart
@@ -1,7 +1,6 @@
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/client/client_reducer.dart';
 import 'package:invoiceninja_flutter/redux/company/company_actions.dart';
-import 'package:invoiceninja_flutter/redux/dashboard/dashboard_actions.dart';
 import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart';
 import 'package:invoiceninja_flutter/redux/ui/ui_state.dart';
 import 'package:invoiceninja_flutter/redux/product/product_reducer.dart';
diff --git a/lib/ui/app/list_filter.dart b/lib/ui/app/list_filter.dart
index bbeef90b4..56f21aa2b 100644
--- a/lib/ui/app/list_filter.dart
+++ b/lib/ui/app/list_filter.dart
@@ -7,13 +7,11 @@ import 'package:redux/redux.dart';
 
 class ListFilter extends StatefulWidget {
   final EntityType entityType;
-  final String filter;
   final String title;
   final Function(String) onFilterChanged;
 
   const ListFilter({
     this.entityType,
-    this.filter,
     this.title,
     this.onFilterChanged,
   });
@@ -29,7 +27,13 @@ class _ListFilterState extends State<ListFilter> {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    _filterController.text = widget.filter;
+
+    final state = StoreProvider.of<AppState>(context).state;
+    final String filter = widget.entityType != null
+        ? state.getListState(widget.entityType).filter
+        : state.uiState.filter;
+
+    _filterController.text = filter;
   }
 
   @override
diff --git a/lib/ui/dashboard/dashboard_view.dart b/lib/ui/dashboard/dashboard_view.dart
index 814b422db..2f8b54c2b 100644
--- a/lib/ui/dashboard/dashboard_view.dart
+++ b/lib/ui/dashboard/dashboard_view.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:invoiceninja_flutter/data/models/entities.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
@@ -53,7 +52,6 @@ class _DashboardViewState extends State<DashboardView>
       drawer: AppDrawerBuilder(),
       appBar: AppBar(
         title: ListFilter(
-          filter: widget.viewModel.filter,
           title: AppLocalization.of(context).dashboard,
           onFilterChanged: (value) {
             store.dispatch(FilterCompany(value));