Refactor job list
This commit is contained in:
@@ -1,11 +1,10 @@
|
||||
import { Ionicons } from "@expo/vector-icons";
|
||||
import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
|
||||
import { createDrawerNavigator } from "@react-navigation/drawer";
|
||||
import { NavigationContainer } from "@react-navigation/native";
|
||||
import { createStackNavigator } from "@react-navigation/stack";
|
||||
import i18n from "i18next";
|
||||
import React, { useEffect } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { SafeAreaView } from "react-native-safe-area-context";
|
||||
import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import {
|
||||
@@ -33,7 +32,6 @@ const MessagingStack = createStackNavigator();
|
||||
const MediaCacheStack = createStackNavigator();
|
||||
const MoreStack = createStackNavigator();
|
||||
const BottomTabs = createBottomTabNavigator();
|
||||
const Drawer = createDrawerNavigator();
|
||||
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
bodyshop: selectBodyshop,
|
||||
@@ -47,11 +45,11 @@ const mapDispatchToProps = (dispatch) => ({
|
||||
signOutStart: () => dispatch(signOutStart()),
|
||||
});
|
||||
|
||||
const JobStackNavigator = ({ navigation }) => (
|
||||
const JobStackNavigator = () => (
|
||||
<JobStack.Navigator initialRouteName="JobList">
|
||||
<JobStack.Screen
|
||||
name="JobList"
|
||||
options={({ route }) => ({
|
||||
options={() => ({
|
||||
title: `${i18n.t("joblist.labels.activejobs")}`,
|
||||
})}
|
||||
component={ScreenJobList}
|
||||
@@ -68,7 +66,7 @@ const JobStackNavigator = ({ navigation }) => (
|
||||
</JobStack.Navigator>
|
||||
);
|
||||
|
||||
const CameraStackNavigator = ({ navigation }) => (
|
||||
const CameraStackNavigator = () => (
|
||||
<CameraStack.Navigator initialRouteName="TabCameraScreen">
|
||||
<CameraStack.Screen
|
||||
name="TabCameraScreen"
|
||||
@@ -78,7 +76,7 @@ const CameraStackNavigator = ({ navigation }) => (
|
||||
</CameraStack.Navigator>
|
||||
);
|
||||
|
||||
const MediaCacheStackNavigator = ({ navigation }) => (
|
||||
const MediaCacheStackNavigator = () => (
|
||||
<MediaCacheStack.Navigator initialRouteName="TabMediaCache">
|
||||
<MediaCacheStack.Screen
|
||||
name="MediaCache"
|
||||
@@ -88,7 +86,7 @@ const MediaCacheStackNavigator = ({ navigation }) => (
|
||||
</MediaCacheStack.Navigator>
|
||||
);
|
||||
|
||||
const MessagingStackNavigator = ({ navigation }) => (
|
||||
const MessagingStackNavigator = () => (
|
||||
<MessagingStack.Navigator>
|
||||
<MessagingStack.Screen
|
||||
name="MessagingList"
|
||||
@@ -100,7 +98,7 @@ const MessagingStackNavigator = ({ navigation }) => (
|
||||
/>
|
||||
</MessagingStack.Navigator>
|
||||
);
|
||||
const MoreStackNavigator = ({ navigation }) => (
|
||||
const MoreStackNavigator = () => (
|
||||
<MoreStack.Navigator>
|
||||
<MoreStack.Screen
|
||||
name="Settings"
|
||||
@@ -115,7 +113,8 @@ const MoreStackNavigator = ({ navigation }) => (
|
||||
const BottomTabsNavigator = () => (
|
||||
<BottomTabs.Navigator
|
||||
screenOptions={({ route }) => ({
|
||||
tabBarIcon: ({ focused, color, size }) => {
|
||||
// eslint-disable-next-line react/display-name
|
||||
tabBarIcon: ({ color, size }) => {
|
||||
let iconName;
|
||||
if (route.name === "JobTab") {
|
||||
iconName = "ios-list";
|
||||
@@ -174,8 +173,6 @@ export function ScreenMainComponent({
|
||||
checkUserSession();
|
||||
}, [checkUserSession]);
|
||||
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<NavigationContainer>
|
||||
{currentUser.authorized === null ? (
|
||||
|
||||
Reference in New Issue
Block a user