From 3e9a67d1aac9baa6713f9f2d493ad18e87e8a416 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 8 Jul 2020 00:26:04 +0300
Subject: [PATCH] Code refactor

---
 lib/redux/app/app_middleware.dart                      | 8 +++++---
 lib/redux/auth/auth_middleware.dart                    | 2 +-
 lib/redux/client/client_reducer.dart                   | 3 ++-
 lib/redux/company/company_actions.dart                 | 7 ++++++-
 lib/redux/company_gateway/company_gateway_reducer.dart | 2 +-
 lib/redux/credit/credit_reducer.dart                   | 2 +-
 lib/redux/design/design_reducer.dart                   | 2 +-
 lib/redux/document/document_reducer.dart               | 2 +-
 lib/redux/expense/expense_reducer.dart                 | 2 +-
 lib/redux/group/group_reducer.dart                     | 2 +-
 lib/redux/invoice/invoice_reducer.dart                 | 2 +-
 lib/redux/payment/payment_reducer.dart                 | 2 +-
 lib/redux/payment_term/payment_term_reducer.dart       | 2 +-
 lib/redux/product/product_reducer.dart                 | 2 +-
 lib/redux/project/project_reducer.dart                 | 2 +-
 lib/redux/quote/quote_reducer.dart                     | 2 +-
 lib/redux/task/task_reducer.dart                       | 2 +-
 lib/redux/tax_rate/tax_rate_reducer.dart               | 2 +-
 lib/redux/token/token_reducer.dart                     | 2 +-
 lib/redux/user/user_reducer.dart                       | 2 +-
 lib/redux/vendor/vendor_reducer.dart                   | 2 +-
 lib/redux/webhook/webhook_reducer.dart                 | 2 +-
 lib/ui/app/menu_drawer_vm.dart                         | 2 +-
 lib/ui/settings/account_management_vm.dart             | 2 +-
 stubs/redux/stub/stub_reducer                          | 2 +-
 25 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/lib/redux/app/app_middleware.dart b/lib/redux/app/app_middleware.dart
index 185c184f0..6cc11f4d6 100644
--- a/lib/redux/app/app_middleware.dart
+++ b/lib/redux/app/app_middleware.dart
@@ -419,12 +419,14 @@ Middleware<AppState> _createAccountLoaded() {
     final action = dynamicAction as LoadAccountSuccess;
     final response = action.loginResponse;
     final selectedCompanyIndex = store.state.uiState.selectedCompanyIndex;
+    final loadedStaticData = response.static.currencies.isNotEmpty;
 
-    if (response.static.currencies.isNotEmpty) {
+    if (loadedStaticData) {
       store.dispatch(LoadStaticSuccess(data: response.static));
     }
 
     print('## userCompanies.length: ${response.userCompanies.length}');
+
     for (int i = 0; i < response.userCompanies.length; i++) {
       final UserCompanyEntity userCompany = response.userCompanies[i];
 
@@ -433,11 +435,11 @@ Middleware<AppState> _createAccountLoaded() {
         prefs.setString(kSharedPrefToken, userCompany.token.obscuredToken);
       }
 
-      store.dispatch(SelectCompany(i));
+      store.dispatch(SelectCompany(companyIndex: i, clearSelection: loadedStaticData));
       store.dispatch(LoadCompanySuccess(userCompany));
     }
 
-    store.dispatch(SelectCompany(selectedCompanyIndex));
+    store.dispatch(SelectCompany(companyIndex: selectedCompanyIndex, clearSelection: loadedStaticData));
     store.dispatch(UserLoginSuccess());
 
     print('## Account is loaded');
diff --git a/lib/redux/auth/auth_middleware.dart b/lib/redux/auth/auth_middleware.dart
index 59404585f..3a66df2c2 100644
--- a/lib/redux/auth/auth_middleware.dart
+++ b/lib/redux/auth/auth_middleware.dart
@@ -270,7 +270,7 @@ Middleware<AppState> _createCompany(AuthRepository repository) {
       store.dispatch(RefreshData(
         completer: Completer<Null>()
           ..future.then<Null>((_) {
-            store.dispatch(SelectCompany(state.companies.length));
+            store.dispatch(SelectCompany(companyIndex: state.companies.length));
             store.dispatch(ViewDashboard(
                 navigator: Navigator.of(action.context), force: true));
           }),
diff --git a/lib/redux/client/client_reducer.dart b/lib/redux/client/client_reducer.dart
index a697da8cf..421411ecc 100644
--- a/lib/redux/client/client_reducer.dart
+++ b/lib/redux/client/client_reducer.dart
@@ -49,7 +49,8 @@ final selectedIdReducer = combineReducers<String>([
   TypedReducer<String, AddClientSuccess>((selectedId, action) {
     return action.client.id;
   }),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>(
+      (selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteClientsSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveClientsSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/company/company_actions.dart b/lib/redux/company/company_actions.dart
index 145528476..da79bc0d0 100644
--- a/lib/redux/company/company_actions.dart
+++ b/lib/redux/company/company_actions.dart
@@ -6,9 +6,13 @@ import 'package:invoiceninja_flutter/data/models/company_model.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 
 class SelectCompany {
-  SelectCompany(this.companyIndex);
+  SelectCompany({
+    @required this.companyIndex,
+    this.clearSelection = true,
+  });
 
   final int companyIndex;
+  final bool clearSelection;
 }
 
 class LoadCompanySuccess {
@@ -44,6 +48,7 @@ class SaveCompanyFailure implements StopSaving {
 
 class AddCompany implements StartSaving {
   AddCompany(this.context);
+
   final BuildContext context;
 }
 
diff --git a/lib/redux/company_gateway/company_gateway_reducer.dart b/lib/redux/company_gateway/company_gateway_reducer.dart
index b3fff3cad..3af4e5d37 100644
--- a/lib/redux/company_gateway/company_gateway_reducer.dart
+++ b/lib/redux/company_gateway/company_gateway_reducer.dart
@@ -21,7 +21,7 @@ Reducer<String> selectedIdReducer = combineReducers([
       (String selectedId, action) => action.companyGatewayId),
   TypedReducer<String, AddCompanyGatewaySuccess>(
       (String selectedId, action) => action.companyGateway.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteCompanyGatewaySuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveCompanyGatewaySuccess>(
       (selectedId, action) => ''),
diff --git a/lib/redux/credit/credit_reducer.dart b/lib/redux/credit/credit_reducer.dart
index 87a60266a..3fd730795 100644
--- a/lib/redux/credit/credit_reducer.dart
+++ b/lib/redux/credit/credit_reducer.dart
@@ -37,7 +37,7 @@ Reducer<String> selectedIdReducer = combineReducers([
       (selectedId, action) => action.credit.id),
   TypedReducer<String, ShowEmailCredit>(
       (selectedId, action) => action.credit.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteCreditsSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveCreditsSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/design/design_reducer.dart b/lib/redux/design/design_reducer.dart
index 380b7f556..64ed3873e 100644
--- a/lib/redux/design/design_reducer.dart
+++ b/lib/redux/design/design_reducer.dart
@@ -20,7 +20,7 @@ Reducer<String> selectedIdReducer = combineReducers([
       (String selectedId, dynamic action) => action.designId),
   TypedReducer<String, AddDesignSuccess>(
       (String selectedId, dynamic action) => action.design.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteDesignsSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveDesignsSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/document/document_reducer.dart b/lib/redux/document/document_reducer.dart
index a3108554e..49b791e9a 100644
--- a/lib/redux/document/document_reducer.dart
+++ b/lib/redux/document/document_reducer.dart
@@ -18,7 +18,7 @@ EntityUIState documentUIReducer(DocumentUIState state, dynamic action) {
 Reducer<String> selectedIdReducer = combineReducers([
   TypedReducer<String, ViewDocument>((selectedId, action) => action.documentId),
   //TypedReducer<String, AddDocumentSuccess>((selectedId, action) => action.document.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteDocumentSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveDocumentSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/expense/expense_reducer.dart b/lib/redux/expense/expense_reducer.dart
index 9849497f0..6f18df829 100644
--- a/lib/redux/expense/expense_reducer.dart
+++ b/lib/redux/expense/expense_reducer.dart
@@ -19,7 +19,7 @@ Reducer<String> selectedIdReducer = combineReducers([
   TypedReducer<String, ViewExpense>((selectedId, action) => action.expenseId),
   TypedReducer<String, AddExpenseSuccess>(
       (selectedId, action) => action.expense.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteExpenseSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveExpenseSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/group/group_reducer.dart b/lib/redux/group/group_reducer.dart
index 1a4bd9e6d..c1b4675a4 100644
--- a/lib/redux/group/group_reducer.dart
+++ b/lib/redux/group/group_reducer.dart
@@ -21,7 +21,7 @@ Reducer<String> selectedIdReducer = combineReducers([
       (String selectedId, action) => action.groupId),
   TypedReducer<String, AddGroupSuccess>(
       (String selectedId, action) => action.group.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteGroupSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveGroupSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/invoice/invoice_reducer.dart b/lib/redux/invoice/invoice_reducer.dart
index cda712118..97f110418 100644
--- a/lib/redux/invoice/invoice_reducer.dart
+++ b/lib/redux/invoice/invoice_reducer.dart
@@ -39,7 +39,7 @@ Reducer<String> selectedIdReducer = combineReducers([
       (selectedId, action) => action.invoice.id),
   TypedReducer<String, ShowEmailInvoice>(
       (selectedId, action) => action.invoice.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteInvoicesSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveInvoicesSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/payment/payment_reducer.dart b/lib/redux/payment/payment_reducer.dart
index 3a6959254..9148ddf5f 100644
--- a/lib/redux/payment/payment_reducer.dart
+++ b/lib/redux/payment/payment_reducer.dart
@@ -19,7 +19,7 @@ Reducer<String> selectedIdReducer = combineReducers([
   TypedReducer<String, ViewPayment>((selectedId, action) => action.paymentId),
   TypedReducer<String, AddPaymentSuccess>(
       (selectedId, action) => action.payment.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeletePaymentsSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchivePaymentsSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/payment_term/payment_term_reducer.dart b/lib/redux/payment_term/payment_term_reducer.dart
index 2f1b85dee..420be77db 100644
--- a/lib/redux/payment_term/payment_term_reducer.dart
+++ b/lib/redux/payment_term/payment_term_reducer.dart
@@ -20,7 +20,7 @@ Reducer<String> selectedIdReducer = combineReducers([
       (String selectedId, dynamic action) => action.paymentTermId),
   TypedReducer<String, AddPaymentTermSuccess>(
       (String selectedId, dynamic action) => action.paymentTerm.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeletePaymentTermsSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchivePaymentTermsSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/product/product_reducer.dart b/lib/redux/product/product_reducer.dart
index 6819bc058..5a975ff9b 100644
--- a/lib/redux/product/product_reducer.dart
+++ b/lib/redux/product/product_reducer.dart
@@ -56,7 +56,7 @@ Reducer<String> selectedIdReducer = combineReducers([
   TypedReducer<String, ViewProduct>((selectedId, action) => action.productId),
   TypedReducer<String, AddProductSuccess>(
       (selectedId, action) => action.product.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteProductsSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveProductsSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/project/project_reducer.dart b/lib/redux/project/project_reducer.dart
index 20b4926d3..31e3ab960 100644
--- a/lib/redux/project/project_reducer.dart
+++ b/lib/redux/project/project_reducer.dart
@@ -35,7 +35,7 @@ Reducer<String> selectedIdReducer = combineReducers([
   TypedReducer<String, ViewProject>((selectedId, action) => action.projectId),
   TypedReducer<String, AddProjectSuccess>(
       (selectedId, action) => action.project.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteProjectSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveProjectSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/quote/quote_reducer.dart b/lib/redux/quote/quote_reducer.dart
index 42bfe4f03..0f4d5da3e 100644
--- a/lib/redux/quote/quote_reducer.dart
+++ b/lib/redux/quote/quote_reducer.dart
@@ -37,7 +37,7 @@ Reducer<String> selectedIdReducer = combineReducers([
   TypedReducer<String, AddQuoteSuccess>(
       (selectedId, action) => action.quote.id),
   TypedReducer<String, ShowEmailQuote>((selectedId, action) => action.quote.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteQuotesSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveQuotesSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/task/task_reducer.dart b/lib/redux/task/task_reducer.dart
index 87bad8140..221dd8395 100644
--- a/lib/redux/task/task_reducer.dart
+++ b/lib/redux/task/task_reducer.dart
@@ -28,7 +28,7 @@ TaskTime editTaskTime(TaskTime taskTime, dynamic action) {
 Reducer<String> selectedIdReducer = combineReducers([
   TypedReducer<String, ViewTask>((selectedId, action) => action.taskId),
   TypedReducer<String, AddTaskSuccess>((selectedId, action) => action.task.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteTaskSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveTaskSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/tax_rate/tax_rate_reducer.dart b/lib/redux/tax_rate/tax_rate_reducer.dart
index 97b681d09..1bca237e5 100644
--- a/lib/redux/tax_rate/tax_rate_reducer.dart
+++ b/lib/redux/tax_rate/tax_rate_reducer.dart
@@ -20,7 +20,7 @@ Reducer<String> selectedIdReducer = combineReducers([
       (String selectedId, action) => action.taxRateId),
   TypedReducer<String, AddTaxRateSuccess>(
       (String selectedId, action) => action.taxRate.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteTaxRatesSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveTaxRatesSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/token/token_reducer.dart b/lib/redux/token/token_reducer.dart
index 1e0c890c8..70b013c11 100644
--- a/lib/redux/token/token_reducer.dart
+++ b/lib/redux/token/token_reducer.dart
@@ -21,7 +21,7 @@ Reducer<String> selectedIdReducer = combineReducers([
       (String selectedId, dynamic action) => action.tokenId),
   TypedReducer<String, AddTokenSuccess>(
       (String selectedId, dynamic action) => action.token.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteTokensSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveTokensSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/user/user_reducer.dart b/lib/redux/user/user_reducer.dart
index 9afbeee0f..362f6fe81 100644
--- a/lib/redux/user/user_reducer.dart
+++ b/lib/redux/user/user_reducer.dart
@@ -19,7 +19,7 @@ Reducer<String> selectedIdReducer = combineReducers([
   TypedReducer<String, ViewUser>((String selectedId, action) => action.userId),
   TypedReducer<String, AddUserSuccess>(
       (String selectedId, action) => action.user.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteUserSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveUserSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/vendor/vendor_reducer.dart b/lib/redux/vendor/vendor_reducer.dart
index 9351c20da..c4e1400e1 100644
--- a/lib/redux/vendor/vendor_reducer.dart
+++ b/lib/redux/vendor/vendor_reducer.dart
@@ -47,7 +47,7 @@ Reducer<String> selectedIdReducer = combineReducers([
   TypedReducer<String, ViewVendor>((selectedId, action) => action.vendorId),
   TypedReducer<String, AddVendorSuccess>(
       (selectedId, action) => action.vendor.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteVendorSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveVendorSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/redux/webhook/webhook_reducer.dart b/lib/redux/webhook/webhook_reducer.dart
index 25abdcd8b..45f759445 100644
--- a/lib/redux/webhook/webhook_reducer.dart
+++ b/lib/redux/webhook/webhook_reducer.dart
@@ -21,7 +21,7 @@ Reducer<String> selectedIdReducer = combineReducers([
       (String selectedId, dynamic action) => action.webhookId),
   TypedReducer<String, AddWebhookSuccess>(
       (String selectedId, dynamic action) => action.webhook.id),
-  TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+  TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
   TypedReducer<String, DeleteWebhooksSuccess>((selectedId, action) => ''),
   TypedReducer<String, ArchiveWebhooksSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),
diff --git a/lib/ui/app/menu_drawer_vm.dart b/lib/ui/app/menu_drawer_vm.dart
index 50c08ba73..b2e141545 100644
--- a/lib/ui/app/menu_drawer_vm.dart
+++ b/lib/ui/app/menu_drawer_vm.dart
@@ -60,7 +60,7 @@ class MenuDrawerVM {
       onCompanyChanged:
           (BuildContext context, String companyIndex, CompanyEntity company) {
         store.dispatch(ClearEntityFilter());
-        store.dispatch(SelectCompany(int.parse(companyIndex)));
+        store.dispatch(SelectCompany(companyIndex: int.parse(companyIndex)));
         if (store.state.isStale) {
           if (!store.state.isLoaded && store.state.company.isLarge) {
             store.dispatch(LoadClients());
diff --git a/lib/ui/settings/account_management_vm.dart b/lib/ui/settings/account_management_vm.dart
index f07ca4d6d..f4b6141c6 100644
--- a/lib/ui/settings/account_management_vm.dart
+++ b/lib/ui/settings/account_management_vm.dart
@@ -66,7 +66,7 @@ class AccountManagementVM {
                     break;
                   }
                 }
-                store.dispatch(SelectCompany(index));
+                store.dispatch(SelectCompany(companyIndex: index));
                 store.dispatch(ViewDashboard(navigator: Navigator.of(context)));
               } else {
                 store.dispatch(UserLogout(context));
diff --git a/stubs/redux/stub/stub_reducer b/stubs/redux/stub/stub_reducer
index 9f2940c5c..0b815bcdb 100644
--- a/stubs/redux/stub/stub_reducer
+++ b/stubs/redux/stub/stub_reducer
@@ -21,7 +21,7 @@ Reducer<String> selectedIdReducer = combineReducers([
       (String selectedId, dynamic action) => action.stubId),
   TypedReducer<String, AddStubSuccess>(
       (String selectedId, dynamic action) => action.stub.id),
-    TypedReducer<String, SelectCompany>((selectedId, action) => ''),
+    TypedReducer<String, SelectCompany>((selectedId, action) => action.clearSelection ? '' : selectedId),
       TypedReducer<String, DeleteStubsSuccess>((selectedId, action) => ''),
       TypedReducer<String, ArchiveStubsSuccess>((selectedId, action) => ''),
   TypedReducer<String, ClearEntityFilter>((selectedId, action) => ''),