Merge pull request #1893 from ever-co/bug/bottom-navigation-tasks-fix…

…-and-re-arrangement tasks icon all the times navigates to current user tasks, re-arranged…
ever-co · Nov 28, 2023 · 534d06e · 534d06e
2 parents 2c693c4 + 92a2f25
commit 534d06e
Show file tree

Hide file tree

Showing 10 changed files with 2,583 additions and 2,647 deletions.
diff --git a/apps/mobile/app/components/Task/EstimateBlock/components/ProfileInfoWithTime.tsx b/apps/mobile/app/components/Task/EstimateBlock/components/ProfileInfoWithTime.tsx
@@ -1,50 +1,41 @@
 /* eslint-disable react-native/no-inline-styles */
 /* eslint-disable react-native/no-color-literals */
-import { Text, StyleSheet, TouchableOpacity, View } from "react-native"
-import React from "react"
-import { Avatar } from "react-native-paper"
-import { imgTitleProfileAvatar } from "../../../../helpers/img-title-profile-avatar"
-import { typography, useAppTheme } from "../../../../theme"
-import { limitTextCharaters } from "../../../../helpers/sub-text"
-import { useNavigation } from "@react-navigation/native"
-import {
-	DrawerNavigationProp,
-	SettingScreenNavigationProp,
-} from "../../../../navigators/AuthenticatedNavigator"
+import { Text, StyleSheet, TouchableOpacity, View } from 'react-native';
+import React from 'react';
+import { Avatar } from 'react-native-paper';
+import { imgTitleProfileAvatar } from '../../../../helpers/img-title-profile-avatar';
+import { typography, useAppTheme } from '../../../../theme';
+import { limitTextCharaters } from '../../../../helpers/sub-text';
+import { useNavigation } from '@react-navigation/native';
+import { DrawerNavigationProp, SettingScreenNavigationProp } from '../../../../navigators/AuthenticatedNavigator';
 
 interface IProfileInfo {
-	names: string
-	profilePicSrc: string
-	userId?: string
-	largerProfileInfo?: boolean
-	estimationsBlock?: boolean
-	time?: string
+	names: string;
+	profilePicSrc: string;
+	userId?: string;
+	largerProfileInfo?: boolean;
+	estimationsBlock?: boolean;
+	time?: string;
 }
 
-const ProfileInfoWithTime: React.FC<IProfileInfo> = ({
-	profilePicSrc,
-	names,
-	userId,
-	largerProfileInfo,
-	time,
-}) => {
-	const { colors } = useAppTheme()
+const ProfileInfoWithTime: React.FC<IProfileInfo> = ({ profilePicSrc, names, userId, largerProfileInfo, time }) => {
+	const { colors } = useAppTheme();
 
-	const alternateNavigation = useNavigation<DrawerNavigationProp<"AuthenticatedTab">>()
-	const navigation = useNavigation<SettingScreenNavigationProp<"Profile">>()
+	const alternateNavigation = useNavigation<DrawerNavigationProp<'AuthenticatedTab'>>();
+	const navigation = useNavigation<SettingScreenNavigationProp<'Profile'>>();
 
 	const navigateToProfile = () => {
-		alternateNavigation.navigate("AuthenticatedTab")
+		alternateNavigation.navigate('AuthenticatedTab');
 		setTimeout(() => {
-			navigation.navigate("Profile", { userId, activeTab: "worked" })
-		}, 50)
-	}
+			navigation.navigate('Profile', { userId, activeTab: 'worked' });
+		}, 50);
+	};
 	return (
 		<View
 			style={{
-				flexDirection: "row",
-				justifyContent: "space-between",
-				paddingRight: !time && 12,
+				flexDirection: 'row',
+				justifyContent: 'space-between',
+				paddingRight: !time && 12
 			}}
 		>
 			<TouchableOpacity onPress={userId && navigateToProfile} style={styles.container}>
@@ -56,9 +47,9 @@ const ProfileInfoWithTime: React.FC<IProfileInfo> = ({
 					/>
 				) : (
 					<Avatar.Text
-						label={imgTitleProfileAvatar(names.replace(" ", ""))}
+						label={imgTitleProfileAvatar(names.replace(' ', ''))}
 						size={largerProfileInfo ? 30 : 20}
-						style={[styles.profileImage, { backgroundColor: "#82c9e0" }]}
+						style={[styles.profileImage, { backgroundColor: '#82c9e0' }]}
 						labelStyle={[styles.prefix, { fontSize: 14 }]}
 					/>
 				)}
@@ -67,41 +58,41 @@ const ProfileInfoWithTime: React.FC<IProfileInfo> = ({
 					style={{
 						fontSize: largerProfileInfo ? 16 : 12,
 						color: colors.primary,
-						fontWeight: "600",
+						fontWeight: '600'
 					}}
 				>
 					{limitTextCharaters({
 						text: names.trim(),
-						numChars: 12,
+						numChars: 12
 					})}
 				</Text>
 			</TouchableOpacity>
 			<Text
 				style={{
 					fontSize: 12,
-					fontWeight: "600",
-					color: time ? colors.primary : "#938FA3",
+					fontWeight: '600',
+					color: time ? colors.primary : '#938FA3'
 				}}
 			>
-				{time ? time : "6 h: 40 m"}
+				{time || '6 h: 40 m'}
 			</Text>
 		</View>
-	)
-}
+	);
+};
 
-export default ProfileInfoWithTime
+export default ProfileInfoWithTime;
 
 const styles = StyleSheet.create({
 	container: {
-		alignItems: "center",
-		flexDirection: "row",
-		gap: 7,
+		alignItems: 'center',
+		flexDirection: 'row',
+		gap: 7
 	},
 	prefix: {
-		color: "#FFFFFF",
-		fontFamily: typography.fonts.PlusJakartaSans.light,
+		color: '#FFFFFF',
+		fontFamily: typography.fonts.PlusJakartaSans.light
 	},
 	profileImage: {
-		borderRadius: 100,
-	},
-})
+		borderRadius: 100
+	}
+});