#1328 - fix for secondary dashboard getting selected on menu select

avniproject · May 7, 2024 · 8e88aa5 · 8e88aa5
1 parent ec23e12
commit 8e88aa5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/openchs-android/src/action/LandingViewActions.js b/packages/openchs-android/src/action/LandingViewActions.js
@@ -54,6 +54,7 @@ class LandingViewActions {
         return {
             ...newState,
             home: true,
+            secondaryDashboardSelected: false
         }
     }
 
@@ -62,6 +63,7 @@ class LandingViewActions {
         return {
             ...newState,
             search: true,
+            secondaryDashboardSelected: false
         }
     }
 
@@ -78,6 +80,7 @@ class LandingViewActions {
         return {
             ...newState,
             register: true,
+            secondaryDashboardSelected: false
         }
     }
 
@@ -86,6 +89,7 @@ class LandingViewActions {
         return {
             ...newState,
             menu: true,
+            secondaryDashboardSelected: false
         }
     }
 

diff --git a/packages/openchs-android/src/views/LandingView.js b/packages/openchs-android/src/views/LandingView.js
@@ -146,9 +146,10 @@ class LandingView extends AbstractComponent {
             registerMenuItem,
             searchMenuItem
         ];
-        if (!_.isNil(secondaryDashboard))
+        if (!_.isNil(secondaryDashboard)) {
             bottomBarIcons.push([this.Icon("dashboard", LandingView.barIconStyle, secondaryDashboardSelected, false, "MaterialIcons"),
-                _.truncate(this.I18n.t(secondaryDashboard.name), {'length': 14}), () => this.dispatchAction(Actions.ON_SECONDARY_DASHBOARD_CLICK), menu]);
+                _.truncate(this.I18n.t(secondaryDashboard.name), {'length': 14}), () => this.dispatchAction(Actions.ON_SECONDARY_DASHBOARD_CLICK), secondaryDashboardSelected]);
+        }
         bottomBarIcons.push(moreMenu);
 
         return (