From 49cde7296eb4e6ecf282bcc425a257461fbbd27a Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 18 Jan 2022 18:05:32 +0200
Subject: [PATCH] Add null check to reports

---
 lib/ui/reports/reports_screen.dart | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/ui/reports/reports_screen.dart b/lib/ui/reports/reports_screen.dart
index e0f86e4af..f9fdf1765 100644
--- a/lib/ui/reports/reports_screen.dart
+++ b/lib/ui/reports/reports_screen.dart
@@ -1229,9 +1229,13 @@ class ReportResult {
     final rows = <DataRow>[];
     final store = StoreProvider.of<AppState>(context);
     final state = store.state;
-    final reportSettings = state.userCompany.settings
-            ?.reportSettings[state.uiState.reportsUIState.report] ??
-        ReportSettingsEntity();
+    final reportState = state.uiState.reportsUIState;
+    final settings = state.userCompany.settings;
+    final reportSettings = settings != null &&
+            settings.reportSettings.containsKey(reportState.report)
+        ? settings.reportSettings[reportState.report]
+        : ReportSettingsEntity();
+
     final Map<String, Map<String, double>> totals = {};
 
     final allColumns = <String>[];