Added SelectionState changes to remaining modules

lib/redux/client/client_selectors.dart

@@ -1,4 +1,5 @@
 import 'package:invoiceninja_flutter/data/models/group_model.dart';
+import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/static/static_state.dart';
 import 'package:memoize/memoize.dart';
 import 'package:built_collection/built_collection.dart';
@@ -28,30 +29,36 @@ List<String> dropdownClientsSelector(
   return list;
 }
 
-var memoizedFilteredClientList = memo8((String filterEntityId,
+var memoizedFilteredClientList = memo7((SelectionState selectionState,
-        EntityType filterEntityType,
         BuiltMap<String, ClientEntity> clientMap,
         BuiltList<String> clientList,
         BuiltMap<String, GroupEntity> groupMap,
         ListUIState clientListState,
         BuiltMap<String, UserEntity> userMap,
         StaticState staticState) =>
-    filteredClientsSelector(filterEntityId, filterEntityType, clientMap,
+    filteredClientsSelector(selectionState, clientMap, clientList, groupMap,
-        clientList, groupMap, clientListState, userMap, staticState));
+        clientListState, userMap, staticState));
 
 List<String> filteredClientsSelector(
-    String filterEntityId,
+    SelectionState selectionState,
-    EntityType filterEntityType,
     BuiltMap<String, ClientEntity> clientMap,
     BuiltList<String> clientList,
     BuiltMap<String, GroupEntity> groupMap,
     ListUIState clientListState,
     BuiltMap<String, UserEntity> userMap,
     StaticState staticState) {
+
+  final filterEntityId = selectionState.filterEntityId;
+  final filterEntityType = selectionState.filterEntityType;
+
   final list = clientList.where((clientId) {
     final client = clientMap[clientId];
     final group = groupMap[client.groupId] ?? GroupEntity(id: client.groupId);
 
+    if (client.id == selectionState.selectedId) {
+      return true;
+    }
+
     if (filterEntityType == EntityType.group && group.id != filterEntityId) {
       return false;
     } else if (filterEntityType == EntityType.user &&

lib/redux/credit/credit_selectors.dart

@@ -1,3 +1,4 @@
+import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/static/static_state.dart';
 import 'package:memoize/memoize.dart';
 import 'package:built_collection/built_collection.dart';
@@ -63,31 +64,36 @@ ClientEntity creditClientSelector(
   return clientMap[credit.clientId];
 }
 
-var memoizedFilteredCreditList = memo8((String filterEntityId,
+var memoizedFilteredCreditList = memo7((SelectionState selectionState,
-        EntityType filterEntityType,
         BuiltMap<String, InvoiceEntity> creditMap,
         BuiltList<String> creditList,
         BuiltMap<String, ClientEntity> clientMap,
         ListUIState creditListState,
         StaticState staticState,
         BuiltMap<String, UserEntity> userMap) =>
-    filteredCreditsSelector(filterEntityId, filterEntityType, creditMap,
+    filteredCreditsSelector(selectionState, creditMap, creditList, clientMap,
-        creditList, clientMap, creditListState, staticState, userMap));
+        creditListState, staticState, userMap));
 
 List<String> filteredCreditsSelector(
-    String filterEntityId,
+    SelectionState selectionState,
-    EntityType filterEntityType,
     BuiltMap<String, InvoiceEntity> creditMap,
     BuiltList<String> creditList,
     BuiltMap<String, ClientEntity> clientMap,
     ListUIState creditListState,
     StaticState staticState,
     BuiltMap<String, UserEntity> userMap) {
+  final filterEntityId = selectionState.filterEntityId;
+  final filterEntityType = selectionState.filterEntityType;
+
   final list = creditList.where((creditId) {
     final credit = creditMap[creditId];
     final client =
         clientMap[credit.clientId] ?? ClientEntity(id: credit.clientId);
 
+    if (credit.id == selectionState.selectedId) {
+      return true;
+    }
+
     if (!client.isActive &&
         !client.matchesEntityFilter(filterEntityType, filterEntityId)) {
       return false;

lib/redux/expense/expense_selectors.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/foundation.dart';
+import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/static/static_state.dart';
 import 'package:memoize/memoize.dart';
 import 'package:built_collection/built_collection.dart';
@@ -81,8 +82,7 @@ List<String> dropdownExpensesSelector(
   return list;
 }
 
-var memoizedFilteredExpenseList = memo10((String filterEntityId,
+var memoizedFilteredExpenseList = memo9((SelectionState selectionState,
-        EntityType filterEntityType,
         BuiltMap<String, ExpenseEntity> expenseMap,
         BuiltMap<String, ClientEntity> clientMap,
         BuiltMap<String, VendorEntity> vendorMap,
@@ -92,8 +92,7 @@ var memoizedFilteredExpenseList = memo10((String filterEntityId,
         BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
         StaticState staticState) =>
     filteredExpensesSelector(
-        filterEntityId,
+        selectionState,
-        filterEntityType,
         expenseMap,
         clientMap,
         vendorMap,
@@ -104,8 +103,7 @@ var memoizedFilteredExpenseList = memo10((String filterEntityId,
         staticState));
 
 List<String> filteredExpensesSelector(
-    String filterEntityId,
+    SelectionState selectionState,
-    EntityType filterEntityType,
     BuiltMap<String, ExpenseEntity> expenseMap,
     BuiltMap<String, ClientEntity> clientMap,
     BuiltMap<String, VendorEntity> vendorMap,
@@ -114,6 +112,9 @@ List<String> filteredExpensesSelector(
     BuiltMap<String, InvoiceEntity> invoiceMap,
     BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
     StaticState staticState) {
+  final filterEntityId = selectionState.filterEntityId;
+  final filterEntityType = selectionState.filterEntityType;
+
   final list = expenseMap.keys.where((expenseId) {
     final expense = expenseMap[expenseId];
     final vendor =
@@ -121,6 +122,10 @@ List<String> filteredExpensesSelector(
     final client =
         clientMap[expense.clientId] ?? ClientEntity(id: expense.clientId);
 
+    if (expense.id == selectionState.selectedId) {
+      return true;
+    }
+
     if (filterEntityType != null) {
       if (filterEntityType == EntityType.client &&
           expense.clientId != filterEntityId) {

lib/redux/payment/payment_selectors.dart

@@ -1,3 +1,4 @@
+import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:memoize/memoize.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
@@ -65,26 +66,27 @@ List<String> dropdownPaymentsSelector(
   return list;
 }
 
-var memoizedFilteredPaymentList = memo8((String filterEntityId,
+var memoizedFilteredPaymentList = memo7((SelectionState selectionState,
-        EntityType filterEntityType,
         BuiltMap<String, PaymentEntity> paymentMap,
         BuiltList<String> paymentList,
         BuiltMap<String, InvoiceEntity> invoiceMap,
         BuiltMap<String, ClientEntity> clientMap,
         BuiltMap<String, UserEntity> userMap,
         ListUIState paymentListState) =>
-    filteredPaymentsSelector(filterEntityId, filterEntityType, paymentMap,
+    filteredPaymentsSelector(selectionState, paymentMap, paymentList,
-        paymentList, invoiceMap, clientMap, userMap, paymentListState));
+        invoiceMap, clientMap, userMap, paymentListState));
 
 List<String> filteredPaymentsSelector(
-    String filterEntityId,
+    SelectionState selectionState,
-    EntityType filterEntityType,
     BuiltMap<String, PaymentEntity> paymentMap,
     BuiltList<String> paymentList,
     BuiltMap<String, InvoiceEntity> invoiceMap,
     BuiltMap<String, ClientEntity> clientMap,
     BuiltMap<String, UserEntity> userMap,
     ListUIState paymentListState) {
+  final filterEntityId = selectionState.filterEntityId;
+  final filterEntityType = selectionState.filterEntityType;
+
   final list = paymentList.where((paymentId) {
     final payment = paymentMap[paymentId];
     if (!payment.matchesStates(paymentListState.stateFilters)) {
@@ -94,6 +96,10 @@ List<String> filteredPaymentsSelector(
     final client =
         clientMap[payment.clientId] ?? ClientEntity(id: payment.clientId);
 
+    if (payment.id == selectionState.selectedId) {
+      return true;
+    }
+
     if (!client.isActive &&
         !client.matchesEntityFilter(filterEntityType, filterEntityId)) {
       return false;

lib/redux/project/project_selectors.dart

@@ -64,24 +64,25 @@ List<String> dropdownProjectsSelector(
   return list;
 }
 
-var memoizedFilteredProjectList = memo7((String filterEntityId,
+var memoizedFilteredProjectList = memo6((SelectionState selectionState,
-        EntityType filterEntityType,
         BuiltMap<String, ProjectEntity> projectMap,
         BuiltList<String> projectList,
         ListUIState projectListState,
         BuiltMap<String, ClientEntity> clientMap,
         BuiltMap<String, UserEntity> userMap) =>
-    filteredProjectsSelector(filterEntityId, filterEntityType, projectMap,
+    filteredProjectsSelector(selectionState, projectMap, projectList,
-        projectList, projectListState, clientMap, userMap));
+        projectListState, clientMap, userMap));
 
 List<String> filteredProjectsSelector(
-    String filterEntityId,
+    SelectionState selectionState,
-    EntityType filterEntityType,
     BuiltMap<String, ProjectEntity> projectMap,
     BuiltList<String> projectList,
     ListUIState projectListState,
     BuiltMap<String, ClientEntity> clientMap,
     BuiltMap<String, UserEntity> userMap) {
+  final filterEntityId = selectionState.filterEntityId;
+  final filterEntityType = selectionState.filterEntityType;
+
   final list = projectList.where((projectId) {
     final project = projectMap[projectId];
     final client =
@@ -89,6 +90,10 @@ List<String> filteredProjectsSelector(
     final user = userMap[project.assignedUserId] ??
         UserEntity(id: project.assignedUserId);
 
+    if (project.id == selectionState.selectedId) {
+      return true;
+    }
+
     if (filterEntityId != null) {
       if (filterEntityType == EntityType.client &&
           !client.matchesEntityFilter(filterEntityType, filterEntityId)) {

lib/redux/quote/quote_selectors.dart

@@ -1,3 +1,4 @@
+import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/static/static_state.dart';
 import 'package:memoize/memoize.dart';
 import 'package:built_collection/built_collection.dart';
@@ -9,31 +10,36 @@ ClientEntity quoteClientSelector(
   return clientMap[quote.clientId];
 }
 
-var memoizedFilteredQuoteList = memo8((String filterEntityId,
+var memoizedFilteredQuoteList = memo7((SelectionState selectionState,
-        EntityType filterEntityType,
         BuiltMap<String, InvoiceEntity> quoteMap,
         BuiltList<String> quoteList,
         BuiltMap<String, ClientEntity> clientMap,
         ListUIState quoteListState,
         StaticState staticState,
         BuiltMap<String, UserEntity> userMap) =>
-    filteredQuotesSelector(filterEntityId, filterEntityType, quoteMap,
+    filteredQuotesSelector(selectionState, quoteMap, quoteList, clientMap,
-        quoteList, clientMap, quoteListState, staticState, userMap));
+        quoteListState, staticState, userMap));
 
 List<String> filteredQuotesSelector(
-    String filterEntityId,
+    SelectionState selectionState,
-    EntityType filterEntityType,
     BuiltMap<String, InvoiceEntity> quoteMap,
     BuiltList<String> quoteList,
     BuiltMap<String, ClientEntity> clientMap,
     ListUIState quoteListState,
     StaticState staticState,
     BuiltMap<String, UserEntity> userMap) {
+  final filterEntityId = selectionState.filterEntityId;
+  final filterEntityType = selectionState.filterEntityType;
+
   final list = quoteList.where((quoteId) {
     final quote = quoteMap[quoteId];
     final client =
         clientMap[quote.clientId] ?? ClientEntity(id: quote.clientId);
 
+    if (quote.id == selectionState.selectedId) {
+      return true;
+    }
+
     if (!client.isActive &&
         !client.matchesEntityFilter(filterEntityType, filterEntityId)) {
       return false;

lib/redux/recurring_invoice/recurring_invoice_selectors.dart

@@ -1,13 +1,13 @@
 import 'package:invoiceninja_flutter/data/models/invoice_model.dart';
+import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/static/static_state.dart';
 import 'package:memoize/memoize.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/redux/ui/list_ui_state.dart';
 
-var memoizedFilteredRecurringInvoiceList = memo8((
+var memoizedFilteredRecurringInvoiceList = memo7((
-  String filterEntityId,
+  SelectionState selectionState,
-  EntityType filterEntityType,
   BuiltMap<String, InvoiceEntity> recurringInvoiceMap,
   BuiltMap<String, ClientEntity> clientMap,
   BuiltList<String> recurringInvoiceList,
@@ -16,8 +16,7 @@ var memoizedFilteredRecurringInvoiceList = memo8((
   BuiltMap<String, UserEntity> userMap,
 ) =>
     filteredRecurringInvoicesSelector(
-      filterEntityId,
+      selectionState,
-      filterEntityType,
       recurringInvoiceMap,
       clientMap,
       recurringInvoiceList,
@@ -27,8 +26,7 @@ var memoizedFilteredRecurringInvoiceList = memo8((
     ));
 
 List<String> filteredRecurringInvoicesSelector(
-  String filterEntityId,
+  SelectionState selectionState,
-  EntityType filterEntityType,
   BuiltMap<String, InvoiceEntity> recurringInvoiceMap,
   BuiltMap<String, ClientEntity> clientMap,
   BuiltList<String> recurringInvoiceList,
@@ -36,11 +34,18 @@ List<String> filteredRecurringInvoicesSelector(
   StaticState staticState,
   BuiltMap<String, UserEntity> userMap,
 ) {
+  final filterEntityId = selectionState.filterEntityId;
+  final filterEntityType = selectionState.filterEntityType;
+
   final list = recurringInvoiceList.where((recurringInvoiceId) {
     final invoice = recurringInvoiceMap[recurringInvoiceId];
     final client =
         clientMap[invoice.clientId] ?? ClientEntity(id: invoice.clientId);
 
+    if (invoice.id == selectionState.selectedId) {
+      return true;
+    }
+
     if (!client.isActive &&
         !client.matchesEntityFilter(filterEntityType, filterEntityId)) {
       return false;

lib/redux/task/task_selectors.dart

@@ -104,8 +104,7 @@ List<String> dropdownTasksSelector(
   return list;
 }
 
-var memoizedFilteredTaskList = memo9((String filterEntityId,
+var memoizedFilteredTaskList = memo8((SelectionState selectionState,
-        EntityType filterEntityType,
         BuiltMap<String, TaskEntity> taskMap,
         BuiltMap<String, ClientEntity> clientMap,
         BuiltMap<String, UserEntity> userMap,
@@ -113,12 +112,11 @@ var memoizedFilteredTaskList = memo9((String filterEntityId,
         BuiltMap<String, InvoiceEntity> invoiceMap,
         BuiltList<String> taskList,
         ListUIState taskListState) =>
-    filteredTasksSelector(filterEntityId, filterEntityType, taskMap, clientMap,
+    filteredTasksSelector(selectionState, taskMap, clientMap, userMap,
-        userMap, projectMap, invoiceMap, taskList, taskListState));
+        projectMap, invoiceMap, taskList, taskListState));
 
 List<String> filteredTasksSelector(
-    String filterEntityId,
+    SelectionState selectionState,
-    EntityType filterEntityType,
     BuiltMap<String, TaskEntity> taskMap,
     BuiltMap<String, ClientEntity> clientMap,
     BuiltMap<String, UserEntity> userMap,
@@ -126,12 +124,19 @@ List<String> filteredTasksSelector(
     BuiltMap<String, InvoiceEntity> invoiceMap,
     BuiltList<String> taskList,
     ListUIState taskListState) {
+  final filterEntityId = selectionState.filterEntityId;
+  final filterEntityType = selectionState.filterEntityType;
+
   final list = taskList.where((taskId) {
     final task = taskMap[taskId];
     final client = clientMap[task.clientId] ?? ClientEntity(id: task.clientId);
     final project =
         projectMap[task.projectId] ?? ProjectEntity(id: task.projectId);
 
+    if (task.id == selectionState.selectedId) {
+      return true;
+    }
+
     if (!client.isActive &&
         !client.matchesEntityFilter(filterEntityType, filterEntityId)) {
       return false;

lib/redux/token/token_selectors.dart

@@ -1,4 +1,5 @@
 import 'package:invoiceninja_flutter/data/models/token_model.dart';
+import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:memoize/memoize.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
@@ -24,28 +25,27 @@ List<String> dropdownTokensSelector(BuiltMap<String, TokenEntity> tokenMap,
   return list;
 }
 
-var memoizedFilteredTokenList = memo5((
+var memoizedFilteredTokenList = memo4((
-  String filterEntityId,
+  SelectionState selectionState,
-  EntityType filterEntityType,
   BuiltMap<String, TokenEntity> tokenMap,
   BuiltList<String> tokenList,
   ListUIState tokenListState,
 ) =>
     filteredTokensSelector(
-      filterEntityId,
+      selectionState,
-      filterEntityType,
       tokenMap,
       tokenList,
       tokenListState,
     ));
 
 List<String> filteredTokensSelector(
-  String filterEntityId,
+  SelectionState selectionState,
-  EntityType filterEntityType,
   BuiltMap<String, TokenEntity> tokenMap,
   BuiltList<String> tokenList,
   ListUIState tokenListState,
 ) {
+  final filterEntityId = selectionState.filterEntityId;
+
   final list = tokenList.where((tokenId) {
     final token = tokenMap[tokenId];
     if (filterEntityId != null && token.id != filterEntityId) {
@@ -54,6 +54,10 @@ List<String> filteredTokensSelector(
       //
     }
 
+    if (token.id == selectionState.selectedId) {
+      return true;
+    }
+
     if (token.isSystem) {
       return false;
     }

lib/redux/webhook/webhook_selectors.dart

@@ -1,4 +1,5 @@
 import 'package:invoiceninja_flutter/data/models/webhook_model.dart';
+import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:memoize/memoize.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
@@ -32,34 +33,38 @@ List<String> dropdownWebhooksSelector(
   return list;
 }
 
-var memoizedFilteredWebhookList = memo5((
+var memoizedFilteredWebhookList = memo4((
-  String filterEntityId,
+  SelectionState selectionState,
-  EntityType filterEntityType,
   BuiltMap<String, WebhookEntity> webhookMap,
   BuiltList<String> webhookList,
   ListUIState webhookListState,
 ) =>
     filteredWebhooksSelector(
-      filterEntityId,
+      selectionState,
-      filterEntityType,
       webhookMap,
       webhookList,
       webhookListState,
     ));
 
 List<String> filteredWebhooksSelector(
-  String filterEntityId,
+  SelectionState selectionState,
-  EntityType filterEntityType,
   BuiltMap<String, WebhookEntity> webhookMap,
   BuiltList<String> webhookList,
   ListUIState webhookListState,
 ) {
+  final filterEntityId = selectionState.filterEntityId;
+  final filterEntityType = selectionState.filterEntityType;
+
   final list = webhookList.where((webhookId) {
     final webhook = webhookMap[webhookId];
     if (filterEntityId != null && webhook.id != filterEntityId) {
       return false;
     } else {}
 
+    if (webhook.id == selectionState.selectedId) {
+      return true;
+    }
+
     if (!webhook.matchesStates(webhookListState.stateFilters)) {
       return false;
     }

lib/ui/client/client_list_vm.dart

@@ -94,8 +94,7 @@ class ClientListVM {
     return ClientListVM(
       state: state,
       clientList: memoizedFilteredClientList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.client),
-          state.uiState.filterEntityType,
           state.clientState.map,
           state.clientState.list,
           state.groupState.map,

lib/ui/client/client_screen_vm.dart

@@ -45,8 +45,7 @@ class ClientScreenVM {
     return ClientScreenVM(
       clientMap: state.clientState.map,
       clientList: memoizedFilteredClientList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.client),
-          state.uiState.filterEntityType,
           state.clientState.map,
           state.clientState.list,
           state.groupState.map,

lib/ui/credit/credit_list_vm.dart

@@ -103,8 +103,7 @@ class CreditListVM extends EntityListVM {
     return CreditListVM(
       state: state,
       invoiceList: memoizedFilteredCreditList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.credit),
-          state.uiState.filterEntityType,
           state.creditState.map,
           state.creditState.list,
           state.clientState.map,

lib/ui/credit/credit_screen_vm.dart

@@ -48,8 +48,7 @@ class CreditScreenVM {
     return CreditScreenVM(
       creditMap: state.creditState.map,
       creditList: memoizedFilteredCreditList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.credit),
-          state.uiState.filterEntityType,
           state.creditState.map,
           state.creditState.list,
           state.clientState.map,

lib/ui/expense/expense_list_vm.dart

@@ -81,8 +81,7 @@ class ExpenseListVM {
       user: state.user,
       listState: state.expenseListState,
       expenseList: memoizedFilteredExpenseList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.expense),
-          state.uiState.filterEntityType,
           state.expenseState.map,
           state.clientState.map,
           state.vendorState.map,

lib/ui/expense/expense_screen_vm.dart

@@ -45,8 +45,7 @@ class ExpenseScreenVM {
     return ExpenseScreenVM(
       expenseMap: state.expenseState.map,
       expenseList: memoizedFilteredExpenseList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.expense),
-          state.uiState.filterEntityType,
           state.expenseState.map,
           state.clientState.map,
           state.vendorState.map,

lib/ui/payment/payment_list_vm.dart

@@ -83,8 +83,7 @@ class PaymentListVM {
       state: state,
       user: state.user,
       paymentList: memoizedFilteredPaymentList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.payment),
-          state.uiState.filterEntityType,
           state.paymentState.map,
           state.paymentState.list,
           state.invoiceState.map,

lib/ui/payment/payment_screen_vm.dart

@@ -45,8 +45,7 @@ class PaymentScreenVM {
     return PaymentScreenVM(
       paymentMap: state.paymentState.map,
       paymentList: memoizedFilteredPaymentList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.payment),
-          state.uiState.filterEntityType,
           state.paymentState.map,
           state.paymentState.list,
           state.invoiceState.map,

lib/ui/project/project_list_vm.dart

@@ -86,8 +86,7 @@ class ProjectListVM {
       state: state,
       listState: state.projectListState,
       projectList: memoizedFilteredProjectList(
-        state.uiState.filterEntityId,
+        state.getUISelection(EntityType.project),
-        state.uiState.filterEntityType,
         state.projectState.map,
         state.projectState.list,
         state.projectListState,

lib/ui/project/project_screen_vm.dart

@@ -45,8 +45,7 @@ class ProjectScreenVM {
     return ProjectScreenVM(
       projectMap: state.projectState.map,
       projectList: memoizedFilteredProjectList(
-        state.uiState.filterEntityId,
+        state.getUISelection(EntityType.project),
-        state.uiState.filterEntityType,
         state.projectState.map,
         state.projectState.list,
         state.projectListState,

lib/ui/quote/quote_list_vm.dart

@@ -96,8 +96,7 @@ class QuoteListVM extends EntityListVM {
     return QuoteListVM(
       state: state,
       invoiceList: memoizedFilteredQuoteList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.quote),
-          state.uiState.filterEntityType,
           state.quoteState.map,
           state.quoteState.list,
           state.clientState.map,

lib/ui/quote/quote_screen_vm.dart

@@ -45,8 +45,7 @@ class QuoteScreenVM {
     return QuoteScreenVM(
       quoteMap: state.quoteState.map,
       quoteList: memoizedFilteredQuoteList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.quote),
-          state.uiState.filterEntityType,
           state.quoteState.map,
           state.quoteState.list,
           state.clientState.map,

lib/ui/recurring_invoice/recurring_invoice_list_vm.dart

@@ -84,8 +84,7 @@ class RecurringInvoiceListVM {
       userCompany: state.userCompany,
       listState: state.recurringInvoiceListState,
       recurringInvoiceList: memoizedFilteredRecurringInvoiceList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.recurringInvoice),
-          state.uiState.filterEntityType,
           state.recurringInvoiceState.map,
           state.clientState.map,
           state.recurringInvoiceState.list,

lib/ui/recurring_invoice/recurring_invoice_screen_vm.dart

@@ -48,8 +48,7 @@ class RecurringInvoiceScreenVM {
     return RecurringInvoiceScreenVM(
       recurringInvoiceMap: state.recurringInvoiceState.map,
       recurringInvoiceList: memoizedFilteredRecurringInvoiceList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.recurringInvoice),
-          state.uiState.filterEntityType,
           state.recurringInvoiceState.map,
           state.clientState.map,
           state.recurringInvoiceState.list,

lib/ui/task/task_list_vm.dart

@@ -83,8 +83,7 @@ class TaskListVM {
       user: state.user,
       listState: state.taskListState,
       taskList: memoizedFilteredTaskList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.task),
-          state.uiState.filterEntityType,
           state.taskState.map,
           state.clientState.map,
           state.userState.map,

lib/ui/task/task_screen_vm.dart

@@ -45,8 +45,7 @@ class TaskScreenVM {
     return TaskScreenVM(
       taskMap: state.taskState.map,
       taskList: memoizedFilteredTaskList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.task),
-          state.uiState.filterEntityType,
           state.taskState.map,
           state.clientState.map,
           state.userState.map,

lib/ui/token/token_list_vm.dart

@@ -88,8 +88,7 @@ class TokenListVM {
       userCompany: state.userCompany,
       listState: state.tokenListState,
       tokenList: memoizedFilteredTokenList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.token),
-          state.uiState.filterEntityType,
           state.tokenState.map,
           state.tokenState.list,
           state.tokenListState),

lib/ui/token/token_screen_vm.dart

@@ -48,8 +48,7 @@ class TokenScreenVM {
     return TokenScreenVM(
       tokenMap: state.tokenState.map,
       tokenList: memoizedFilteredTokenList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.token),
-          state.uiState.filterEntityType,
           state.tokenState.map,
           state.tokenState.list,
           state.tokenListState),

lib/ui/webhook/webhook_list_vm.dart

@@ -88,8 +88,7 @@ class WebhookListVM {
       userCompany: state.userCompany,
       listState: state.webhookListState,
       webhookList: memoizedFilteredWebhookList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.webhook),
-          state.uiState.filterEntityType,
           state.webhookState.map,
           state.webhookState.list,
           state.webhookListState),

lib/ui/webhook/webhook_screen_vm.dart

@@ -48,8 +48,7 @@ class WebhookScreenVM {
     return WebhookScreenVM(
       webhookMap: state.webhookState.map,
       webhookList: memoizedFilteredWebhookList(
-          state.uiState.filterEntityId,
+          state.getUISelection(EntityType.webhook),
-          state.uiState.filterEntityType,
           state.webhookState.map,
           state.webhookState.list,
           state.webhookListState),