Reports

lib/redux/company/company_reducer.dart

@@ -81,9 +81,8 @@ UserCompanyEntity loadCompanySuccessReducer(
 
   // Check user has a blank user settings object
   if (userCompany?.settings?.accentColor == null) {
-    userCompany = userCompany.rebuild((b) => b
+    userCompany =
-        ..settings.replace(UserSettingsEntity())
+        userCompany.rebuild((b) => b..settings.replace(UserSettingsEntity()));
-    );
   }
 
   userCompany = userCompany.rebuild((b) => b.company
@@ -118,13 +117,14 @@ UserCompanyEntity loadCompanySuccessReducer(
   }
   */
 
-  return userCompany
+  userCompany = userCompany.rebuild((b) => b
-    ..company.rebuild((b) => b
+    ..company.userMap.addAll(Map.fromIterable(
-      ..userMap.addAll(Map.fromIterable(
+          action.userCompany.company.users,
-        action.userCompany.company.users,
+          key: (dynamic item) => item.id,
-        key: (dynamic item) => item.id,
+          value: (dynamic item) => item,
-        value: (dynamic item) => item,
+        )));
-      )));
+
+  return userCompany;
 }
 
 UserCompanyEntity saveCompanySuccessReducer(

lib/ui/reports/client_report.dart

@@ -71,6 +71,7 @@ ReportResult clientReport(UserCompanyEntity userCompany,
           value = client.assignedUserId;
           break;
         case ClientFields.createdBy:
+          print('## USER ARRAY ${userCompany.company.users}');
           print('## USER MAP ${userCompany.company.userMap}');
           value = userCompany
                   .company.userMap[client.createdUserId]?.listDisplayName ??

lib/ui/reports/reports_screen.dart

@@ -150,7 +150,7 @@ class ReportsScreen extends StatelessWidget {
             ),
             FormCard(
               child: ReportDataTable(
-                //key: ObjectKey(state.uiState.reportsUIState),
+                //key: ObjectKey(viewModel.reportResult.columns),
                 viewModel: viewModel,
               ),
             )