From 7d0df0e7ce6d207c35bca49d06fbc621fde1dd05 Mon Sep 17 00:00:00 2001
From: Arnaud Vergnet <arnaud.vergnet@mailo.com>
Date: Tue, 18 May 2021 18:31:18 +0200
Subject: [PATCH] Fix startup crash

---
 src/navigation/MainNavigator.tsx | 31 +++++++++++++++++++------------
 src/navigation/TabNavigator.tsx  |  4 ++--
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/navigation/MainNavigator.tsx b/src/navigation/MainNavigator.tsx
index 7f9938d..6ae0d1e 100644
--- a/src/navigation/MainNavigator.tsx
+++ b/src/navigation/MainNavigator.tsx
@@ -115,19 +115,9 @@ function getIntroScreens() {
   );
 }
 
-function MainStackComponent(props: {
-  showIntro: boolean;
-  createTabNavigator: () => React.ReactElement;
-}) {
-  const { showIntro, createTabNavigator } = props;
-  if (showIntro) {
-    return getIntroScreens();
-  }
+function getRegularScreens(createTabNavigator: () => React.ReactElement) {
   return (
-    <MainStack.Navigator
-      initialRouteName={showIntro ? MainRoutes.Intro : MainRoutes.Main}
-      headerMode={'screen'}
-    >
+    <>
       <MainStack.Screen
         name={MainRoutes.Main}
         component={createTabNavigator}
@@ -303,6 +293,21 @@ function MainStackComponent(props: {
           title: i18n.t('screens.feedback.title'),
         }}
       />
+    </>
+  );
+}
+
+function MainStackComponent(props: {
+  showIntro: boolean;
+  createTabNavigator: () => React.ReactElement;
+}) {
+  const { showIntro, createTabNavigator } = props;
+  return (
+    <MainStack.Navigator
+      initialRouteName={showIntro ? MainRoutes.Intro : MainRoutes.Main}
+      headerMode={'screen'}
+    >
+      {showIntro ? getIntroScreens() : getRegularScreens(createTabNavigator)}
     </MainStack.Navigator>
   );
 }
@@ -315,6 +320,8 @@ type PropsType = {
 export default function MainNavigator(props: PropsType) {
   const { preferences } = usePreferences();
   const showIntro = getPreferenceBool(PreferenceKeys.showIntro, preferences);
+  console.log(preferences);
+
   return (
     <MainStackComponent
       showIntro={showIntro !== false}
diff --git a/src/navigation/TabNavigator.tsx b/src/navigation/TabNavigator.tsx
index c5cc56e..cd46841 100644
--- a/src/navigation/TabNavigator.tsx
+++ b/src/navigation/TabNavigator.tsx
@@ -254,7 +254,7 @@ const ICONS: {
     normal: '',
     focused: '',
   },
-  planning: {
+  events: {
     normal: 'calendar-range-outline',
     focused: 'calendar-range',
   },
@@ -285,7 +285,7 @@ export default function TabNavigator(props: PropsType) {
     services: i18n.t('screens.services.title'),
     proxiwash: i18n.t('screens.proxiwash.title'),
     home: i18n.t('screens.home.title'),
-    planning: i18n.t('screens.planning.title'),
+    events: i18n.t('screens.planning.title'),
     planex: i18n.t('screens.planex.title'),
   };
   return (