From e6835b0d6f01d0fdfb432ec81c148d88df0b59e3 Mon Sep 17 00:00:00 2001
From: Arnaud Vergnet <vergnet@etud.insa-toulouse.fr>
Date: Tue, 21 Apr 2020 19:40:40 +0200
Subject: [PATCH] Improved dashboard interaction

---
 src/navigation/MainTabNavigator.js | 1 +
 src/screens/Home/HomeScreen.js     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/navigation/MainTabNavigator.js b/src/navigation/MainTabNavigator.js
index 885f733..0cccaaf 100644
--- a/src/navigation/MainTabNavigator.js
+++ b/src/navigation/MainTabNavigator.js
@@ -235,6 +235,7 @@ function HomeStackComponent(initialRoute: string | null, defaultData: { [key: st
                     ...modalTransition,
                 }}
             />
+            {createScreenCollapsibleStack("self-menu", PlanningStack, SelfMenuScreen, i18n.t('screens.menuSelf'), true, {...modalTransition})}
 
             <HomeStack.Screen
                 name="login"
diff --git a/src/screens/Home/HomeScreen.js b/src/screens/Home/HomeScreen.js
index 2d0887f..73e0c06 100644
--- a/src/screens/Home/HomeScreen.js
+++ b/src/screens/Home/HomeScreen.js
@@ -169,7 +169,7 @@ class HomeScreen extends React.Component<Props> {
     };
 
     onMenuClick = () => {
-        this.props.navigation.navigate('services', {screen: "index"});
+        this.props.navigation.navigate('self-menu');
     };
 
     /**
@@ -248,7 +248,7 @@ class HomeScreen extends React.Component<Props> {
                     },
                     {
                         id: 'today_menu',
-                        data: dashboardData == null ? 0 : dashboardData.today_menu,
+                        data: dashboardData == null ? [] : dashboardData.today_menu,
                         icon: 'silverware-fork-knife',
                         color: this.colors.menuColor,
                         onPress: this.onMenuClick,