App.tsx

@@ -53,9 +53,9 @@ type StateType = {
 export default class App extends React.Component<{}, StateType> {
   navigatorRef: { current: null | NavigationContainerRef };
 
-  defaultHomeRoute: string | undefined;
+  defaultHomeRoute: string | null;
 
-  defaultHomeData: { [key: string]: string } | undefined;
+  defaultHomeData: { [key: string]: string };
 
   urlHandler: URLHandler;
 
@@ -67,8 +67,8 @@ export default class App extends React.Component<{}, StateType> {
     };
     initLocales();
     this.navigatorRef = React.createRef();
-    this.defaultHomeRoute = undefined;
+    this.defaultHomeRoute = null;
-    this.defaultHomeData = undefined;
+    this.defaultHomeData = {};
     this.urlHandler = new URLHandler(this.onInitialURLParsed, this.onDetectURL);
     this.urlHandler.listen();
     setSafeBounceHeight(Platform.OS === 'ios' ? 100 : 20);

src/navigation/MainNavigator.tsx

@@ -313,25 +313,18 @@ function MainStackComponent(props: {
 }
 
 type PropsType = {
-  defaultHomeRoute?: string;
+  defaultHomeRoute: string | null;
-  defaultHomeData?: { [key: string]: string };
+  defaultHomeData: { [key: string]: string };
 };
 
-function MainNavigator(props: PropsType) {
+export default function MainNavigator(props: PropsType) {
   const { preferences } = usePreferences();
   const showIntro = getPreferenceBool(PreferenceKeys.showIntro, preferences);
-  const createTabNavigator = () => <TabNavigator {...props} />;
+
   return (
     <MainStackComponent
       showIntro={showIntro !== false}
-      createTabNavigator={createTabNavigator}
+      createTabNavigator={() => <TabNavigator {...props} />}
     />
   );
 }
-
-export default React.memo(
-  MainNavigator,
-  (pp: PropsType, np: PropsType) =>
-    pp.defaultHomeRoute === np.defaultHomeRoute &&
-    pp.defaultHomeData === np.defaultHomeData
-);

src/navigation/TabNavigator.tsx

@@ -136,8 +136,8 @@ function PlanningStackComponent() {
 const HomeStack = createStackNavigator();
 
 function HomeStackComponent(
-  initialRoute?: string,
+  initialRoute: string | null,
-  defaultData?: { [key: string]: string }
+  defaultData: { [key: string]: string }
 ) {
   let params;
   if (initialRoute) {
@@ -232,8 +232,8 @@ function PlanexStackComponent() {
 const Tab = createBottomTabNavigator<TabStackParamsList>();
 
 type PropsType = {
-  defaultHomeRoute?: string;
+  defaultHomeRoute: string | null;
-  defaultHomeData?: { [key: string]: string };
+  defaultHomeData: { [key: string]: string };
 };
 
 const ICONS: {
@@ -264,7 +264,7 @@ const ICONS: {
   },
 };
 
-function TabNavigator(props: PropsType) {
+export default function TabNavigator(props: PropsType) {
   const { preferences } = usePreferences();
   let defaultRoute = getPreferenceString(
     PreferenceKeys.defaultStartScreen,
@@ -324,13 +324,6 @@ function TabNavigator(props: PropsType) {
   );
 }
 
-export default React.memo(
-  TabNavigator,
-  (pp: PropsType, np: PropsType) =>
-    pp.defaultHomeRoute === np.defaultHomeRoute &&
-    pp.defaultHomeData === np.defaultHomeData
-);
-
 export enum TabRoutes {
   Services = 'services',
   Proxiwash = 'proxiwash',

src/screens/Home/HomeScreen.tsx

@@ -139,6 +139,9 @@ const generateNewsFeed = (rawFeed: RawNewsFeedType): Array<FeedItemType> => {
   return finalFeed;
 };
 
+/**
+ * Class defining the app's home screen
+ */
 function HomeScreen(props: Props) {
   const theme = useTheme();
   const navigation = useNavigation();

src/screens/MainApp.tsx

@@ -15,8 +15,8 @@ import { CustomDarkTheme, CustomWhiteTheme } from '../utils/Themes';
 import { setupStatusBar } from '../utils/Utils';
 
 type Props = {
-  defaultHomeRoute?: string;
+  defaultHomeRoute: string | null;
-  defaultHomeData?: { [key: string]: string };
+  defaultHomeData: { [key: string]: string };
 };
 
 function MainApp(props: Props, ref?: Ref<NavigationContainerRef>) {

src/utils/asyncStorage.ts

@@ -76,6 +76,8 @@ export function retrievePreferences(
   return new Promise((resolve: (preferences: PreferencesType) => void) => {
     AsyncStorage.multiGet(keys)
       .then((result) => {
+        console.log(result);
+
         const preferences = { ...defaults };
         result.forEach((item) => {
           let [key, value] = item;