#1540 | Nil check for CustomDashboard activeDashboardUUID

avniproject · Oct 30, 2024 · c2a4bb1 · c2a4bb1
1 parent e43462d
commit c2a4bb1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/openchs-android/src/views/customDashboard/CustomDashboardView.js b/packages/openchs-android/src/views/customDashboard/CustomDashboardView.js
@@ -332,7 +332,7 @@ class CustomDashboardView extends AbstractComponent {
 
         let filterConfigs, asOnDateFilterUUID, asOnDateFilter, asOnDateFilterValue, filters, dashboard;
         const hasDashboards = this.state.dashboards.length !== 0;
-        if (hasDashboards) {
+        if (hasDashboards && !_.isNil(this.state.activeDashboardUUID)) {
             dashboard = this.state.dashboards.find((x) => x.uuid === this.state.activeDashboardUUID);
             filters = dashboardFilterService.getFilters(dashboard.uuid);
             filterConfigs = dashboardFilterService.getFilterConfigsForDashboard(dashboard.uuid);