Merge branch '10.1.0'

avniproject · Nov 13, 2024 · 7d2c1ba · 7d2c1ba
2 parents 3d96864 + 2233a08
commit 7d2c1ba
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/packages/openchs-android/package.json b/packages/openchs-android/package.json
@@ -59,7 +59,7 @@
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "native-base": "3.4.9",
-    "openchs-models": "1.32.16",
+    "openchs-models": "1.32.19",
     "jshashes": "1.0.8",
     "prop-types": "15.8.1",
     "react": "18.2.0",

diff --git a/packages/openchs-android/src/views/RootView.js b/packages/openchs-android/src/views/RootView.js
@@ -47,8 +47,7 @@ class RootView extends AbstractComponent {
             try {
                 await authService.fetchAuthSettingsFromServer();
             } catch (error) {
-                const i18n = this.getService(MessageService).getI18n();
-                getAvniError(error, i18n).then(avniError => AlertMessage(i18n.t('Error'), avniError.getDisplayMessage(), BackHandler.exitApp));
+                return AlertMessage('Error', 'Server under maintenance. Please try again after sometime.\n\nPlease kill the app and relaunch if stuck on logo screen.', BackHandler.exitApp);
             }
         }
         const decisionParameters = await this.nextScreenDecisionParameters();

diff --git a/packages/openchs-android/src/views/customDashboard/CustomDashboardView.js b/packages/openchs-android/src/views/customDashboard/CustomDashboardView.js
@@ -331,7 +331,7 @@ class CustomDashboardView extends AbstractComponent {
         const dashboardFilterService = this.getService(DashboardFilterService);
 
         let filterConfigs, asOnDateFilterUUID, asOnDateFilter, asOnDateFilterValue, filters, dashboard;
-        const hasDashboards = this.state.dashboards.length !== 0;
+        const hasDashboards = this.state.dashboards.length !== 0 && !_.isNil(this.state.activeDashboardUUID);
         if (hasDashboards) {
             dashboard = this.state.dashboards.find((x) => x.uuid === this.state.activeDashboardUUID);
             filters = dashboardFilterService.getFilters(dashboard.uuid);