resolve conflicts

src/navigations/TabNavigation/TabNavigation.tsx

@@ -10,7 +10,7 @@ import { TabViewStyle } from './style';
 import GoalsScreenStack from '../../screens/GoalScreen/GoalScreen';
 import HomeScreenV2 from '../../screens/HomeScreen/HomeScreenV2';
 import { useSelector } from 'react-redux';
-import ProfileScreen2 from '../../screens/ProfileScreen/ProfileScreen2';
+import { AllTaskScreenStack } from '../../screens/Stacks/AllStack';
 
 const tab = createBottomTabNavigator();
 
@@ -91,7 +91,7 @@ const TabNavigation = () => {
 
         <tab.Screen
           name={Strings.Tab_Profile}
-          component={ProfileScreen2}
+          component={AllTaskScreenStack}
           options={{
             headerShown: false,
             tabBarLabel: ({ focused }) => {

src/screens/ProfileScreen/DetailsScreen/AllTaskDetailScreen.tsx

@@ -0,0 +1,12 @@
+import { Text, View } from 'react-native';
+import React from 'react';
+
+const AllTaskDetailScreen = () => {
+  return (
+    <View>
+      <Text>AllTaskDetailScreen</Text>
+    </View>
+  );
+};
+
+export default AllTaskDetailScreen;

src/screens/ProfileScreen/ProfileScreen2.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useCallback, useContext } from 'react';
-import { View, Text, ScrollView, Pressable, StyleSheet } from 'react-native';
+import { View, Text, ScrollView, Pressable } from 'react-native';
 import { ScreenViewContainer } from '../../styles/GlobalStyle';
 import { profileScreenStyles } from './styles';
 import ButtonWidget from '../../components/ButtonWidget';
@@ -8,40 +8,12 @@ import UploadImageModalView from '../../components/GalleryModal';
 import { AuthContext } from '../../context/AuthContext';
 import { ImagePickerResponse } from 'react-native-image-picker';
 import Strings from '../../i18n/en';
-import UserData from './User Data/UserData';
 import { useSelector, useDispatch } from 'react-redux';
-import All from './UserDataV2/All';
+import All from './TaskScreens/All';
 // import Note from './UserDataV2/NoteWorthy';
 import { Tabs } from 'react-native-collapsible-tab-view';
-import { useFocusEffect } from '@react-navigation/native';
-import { fetchContribution } from '../AuthScreen/Util';
-import DisplayContribution from '../../components/DisplayContribution';
-
-const ActiveScreen = () => {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const [activeTasks, setActiveTasks] = useState([]);
-  const { loggedInUserData } = useContext(AuthContext);
-
-  useFocusEffect(
-    useCallback(() => {
-      (async () => {
-        const userName = loggedInUserData?.username;
-        const contributionResponse = await fetchContribution(userName);
-        setActiveTasks(
-          contributionResponse.all.filter(
-            (item) => item.task.status === 'IN_PROGRESS',
-          ),
-        );
-      })();
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []),
-  );
-  return (
-    <View style={styles.profile}>
-      <DisplayContribution tasks={activeTasks} />
-    </View>
-  );
-};
+import ActiveScreen from './TaskScreens/ActiveTask';
+import UserData from './User Data/UserData';
 
 const ProfileScreen = () => {
   const dispatch = useDispatch();
@@ -131,11 +103,4 @@ const ProfileScreen2: React.FC = () => {
   );
 };
 
-const styles = StyleSheet.create({
-  profile: {
-    justifyContent: 'flex-start',
-    alignItems: 'center',
-  },
-});
-
 export default ProfileScreen2;

src/screens/ProfileScreen/TaskScreens/ActiveTask.tsx

@@ -0,0 +1,43 @@
+import React from 'react';
+import { useFocusEffect } from '@react-navigation/native';
+import { useCallback, useContext, useState } from 'react';
+import { fetchContribution } from '../../AuthScreen/Util';
+import { AuthContext } from '../../../context/AuthContext';
+import DisplayContribution from '../../../components/DisplayContribution';
+import { View } from 'react-native';
+import { StyleSheet } from 'react-native';
+
+const ActiveScreen = () => {
+  const [activeTasks, setActiveTasks] = useState([]);
+  const { loggedInUserData } = useContext(AuthContext);
+
+  useFocusEffect(
+    useCallback(() => {
+      (async () => {
+        const userName = loggedInUserData?.username;
+        const contributionResponse = await fetchContribution(userName);
+        setActiveTasks(
+          contributionResponse.all.filter(
+            (item: { task: { status: string } }) =>
+              item.task.status === 'ACTIVE',
+          ),
+        );
+      })();
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []),
+  );
+  return (
+    <View style={styles.profile}>
+      <DisplayContribution tasks={activeTasks} />
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  profile: {
+    justifyContent: 'flex-start',
+    alignItems: 'center',
+  },
+});
+
+export default ActiveScreen;

src/screens/ProfileScreen/UserDataV2/All.tsx → src/screens/ProfileScreen/TaskScreens/All.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useContext, useState } from 'react';
 import { ScrollView } from 'react-native';
-import { fetchContribution } from '../../AuthScreen/Util';
+
 import { useFocusEffect } from '@react-navigation/native';
 import { AuthContext } from '../../../context/AuthContext';
 import DisplayContribution from '../../../components/DisplayContribution';