From a4f1d0aaca43833f700d48eee43fbdb09443d2a4 Mon Sep 17 00:00:00 2001
From: Innocent-akim <gentilakili98@gmail.com>
Date: Mon, 19 Aug 2024 20:59:06 +0200
Subject: [PATCH 1/5] fix: Resolve app crash on Task Page

---
 apps/web/components/pages/task/ChildIssueCard.tsx | 2 +-
 apps/web/components/pages/task/IssueCard.tsx      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web/components/pages/task/ChildIssueCard.tsx b/apps/web/components/pages/task/ChildIssueCard.tsx
index 8e910ad3b..3b5999936 100644
--- a/apps/web/components/pages/task/ChildIssueCard.tsx
+++ b/apps/web/components/pages/task/ChildIssueCard.tsx
@@ -56,7 +56,7 @@ export const ChildIssueCard = () => {
 
 			{childTasks.length > 0 && (
 				<div className={clsxm('flex flex-col max-h-80 gap-3', hidden && ['hidden'])}>
-					{childTasks.map((task) => {
+					{childTasks?.map((task) => {
 						return <TaskLinkedIssue key={task.id} task={task} className="dark:bg-[#25272D] py-0" />;
 					})}
 				</div>
diff --git a/apps/web/components/pages/task/IssueCard.tsx b/apps/web/components/pages/task/IssueCard.tsx
index e279be65e..7d157f187 100644
--- a/apps/web/components/pages/task/IssueCard.tsx
+++ b/apps/web/components/pages/task/IssueCard.tsx
@@ -55,7 +55,7 @@ export const RelatedIssueCard = () => {
 				<div className="flex items-center justify-end gap-2.5">
 					<div className="border-r border-r-[#0000001A] flex items-center gap-2.5">
 						<span onClick={modal.openModal}>
-						<AddIcon className="h-4 w-4 text-[#B1AEBC] dark:text-white cursor-pointer mr-1.5" />
+							<AddIcon className="h-4 w-4 text-[#B1AEBC] dark:text-white cursor-pointer mr-1.5" />
 						</span>
 					</div>
 
@@ -84,7 +84,7 @@ export const RelatedIssueCard = () => {
 
 			{linkedTasks.length > 0 && (
 				<div className={clsxm('flex flex-col max-h-80 gap-3', hidden && ['hidden'])}>
-					{linkedTasks.map(({ task, issue }) => {
+					{linkedTasks?.map(({ task, issue }) => {
 						return (
 							<TaskLinkedIssue
 								key={task.id}

From 7a9df76d5c62dcff10668c18475d415bbc71b611 Mon Sep 17 00:00:00 2001
From: AKILIMAILI CIZUNGU Innocent
 <51681130+Innocent-Akim@users.noreply.github.com>
Date: Mon, 19 Aug 2024 21:24:14 +0200
Subject: [PATCH 2/5] feat: Auto-complete email domain and pre-fill name based
 on email or existing employee data (#2930)

---
 .../features/team/invite/invite-form-modal.tsx  | 17 ++++++++++++++++-
 apps/web/lib/features/user-profile-plans.tsx    |  8 +++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/apps/web/lib/features/team/invite/invite-form-modal.tsx b/apps/web/lib/features/team/invite/invite-form-modal.tsx
index c9e552c5e..55fcdc111 100644
--- a/apps/web/lib/features/team/invite/invite-form-modal.tsx
+++ b/apps/web/lib/features/team/invite/invite-form-modal.tsx
@@ -6,7 +6,7 @@ import { IInviteEmail } from '@app/interfaces';
 import { AxiosError } from 'axios';
 import { isEmail, isNotEmpty } from 'class-validator';
 import { BackButton, Button, Card, InputField, Modal, Text } from 'lib/components';
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { useTranslations } from 'next-intl';
 import { InviteEmailDropdown } from './invite-email-dropdown';
 
@@ -21,6 +21,8 @@ export function InviteFormModal({ open, closeModal }: { open: boolean; closeModa
 	const { workingEmployees } = useEmployee();
 	const [currentOrgEmails, setCurrentOrgEmails] = useState<IInviteEmail[]>([]);
 	const { activeTeam } = useOrganizationTeams();
+	const nameInputRef = useRef<HTMLInputElement>(null);
+
 
 	useEffect(() => {
 		if (activeTeam?.members) {
@@ -38,9 +40,21 @@ export function InviteFormModal({ open, closeModal }: { open: boolean; closeModa
 	}, [workingEmployees, workingEmployees.length, activeTeam]);
 
 	const handleAddNew = (email: string) => {
+
+		if (!email.includes('@')) {
+			email = `${email}@gmail.com`;
+		}
+
 		const newItem = { title: email, name: '' };
 		setSelectedEmail(newItem);
+
 		setCurrentOrgEmails([...currentOrgEmails, newItem]);
+		const extractedName = email.split('@')[0];
+		if (nameInputRef.current) {
+			nameInputRef.current.value = extractedName;
+			nameInputRef.current.focus();
+			nameInputRef.current.select();
+		}
 	};
 
 	const handleSubmit = useCallback(
@@ -99,6 +113,7 @@ export function InviteFormModal({ open, closeModal }: { open: boolean; closeModa
 							/>
 
 							<InputField
+								ref={nameInputRef}
 								type="text"
 								name="name"
 								placeholder={t('form.TEAM_MEMBER_NAME_PLACEHOLDER')}
diff --git a/apps/web/lib/features/user-profile-plans.tsx b/apps/web/lib/features/user-profile-plans.tsx
index d46c13244..5782b03a5 100644
--- a/apps/web/lib/features/user-profile-plans.tsx
+++ b/apps/web/lib/features/user-profile-plans.tsx
@@ -41,17 +41,15 @@ type FilterOutstanding = 'ALL' | 'DATE';
 
 export function UserProfilePlans() {
 	const t = useTranslations();
-	const defaultTab =
-		typeof window !== 'undefined'
-			? (window.localStorage.getItem('daily-plan-tab') as FilterTabs) || null
-			: 'Today Tasks';
 
 	const profile = useUserProfilePage();
 	const { todayPlan, futurePlans, pastPlans, outstandingPlans, sortedPlans, profileDailyPlans } = useDailyPlan();
 	const fullWidth = useRecoilValue(fullWidthState);
-	const [currentTab, setCurrentTab] = useState<FilterTabs>(defaultTab || 'Today Tasks');
 	const [currentOutstanding, setCurrentOutstanding] = useLocalStorageState<FilterOutstanding>('outstanding', 'ALL');
 
+	const [currentTab, setCurrentTab] = useLocalStorageState<FilterTabs>('daily-plan-tab', 'Today Tasks');
+
+
 	const [currentDataDailyPlan, setCurrentDataDailyPlan] = useRecoilState(dataDailyPlanState);
 	const { setDate, date } = useDateRange(currentTab);
 

From ae832b579932b9b5e3baa07d9005feaea8e071b0 Mon Sep 17 00:00:00 2001
From: cedric karungu <ckarungu921@gmail.com>
Date: Mon, 19 Aug 2024 21:25:11 +0200
Subject: [PATCH 3/5] [Improvement]: Global | Translations (#2917)

* feat: add missing translate on Dailyplan

* feat: translation of plans Menu

* feat: Outstading Header

* feat: email on Invite Popup

* fix: default Issue Type Translation

* feat: Manual time Popup
---
 .../app/[locale]/profile/[memberId]/page.tsx  |  3 ---
 .../manual-time/add-manual-time-modal.tsx     | 24 ++++++++---------
 .../task/daily-plan/task-estimated-count.tsx  |  6 +++--
 .../team/invite/invite-email-dropdown.tsx     |  6 +++--
 apps/web/lib/features/user-profile-plans.tsx  | 23 +++++++++-------
 .../lib/settings/default-issue-type-form.tsx  |  2 +-
 apps/web/locales/ar.json                      | 27 ++++++++++++++++++-
 apps/web/locales/bg.json                      | 27 ++++++++++++++++++-
 apps/web/locales/de.json                      | 27 ++++++++++++++++++-
 apps/web/locales/en.json                      | 25 +++++++++++++++++
 apps/web/locales/es.json                      | 27 ++++++++++++++++++-
 apps/web/locales/fr.json                      | 27 ++++++++++++++++++-
 apps/web/locales/he.json                      | 27 ++++++++++++++++++-
 apps/web/locales/it.json                      | 27 ++++++++++++++++++-
 apps/web/locales/nl.json                      | 27 ++++++++++++++++++-
 apps/web/locales/pl.json                      | 27 ++++++++++++++++++-
 apps/web/locales/pt.json                      | 27 ++++++++++++++++++-
 apps/web/locales/ru.json                      | 27 ++++++++++++++++++-
 apps/web/locales/zh.json                      | 27 ++++++++++++++++++-
 19 files changed, 372 insertions(+), 41 deletions(-)

diff --git a/apps/web/app/[locale]/profile/[memberId]/page.tsx b/apps/web/app/[locale]/profile/[memberId]/page.tsx
index 2152a1cf4..cfe785764 100644
--- a/apps/web/app/[locale]/profile/[memberId]/page.tsx
+++ b/apps/web/app/[locale]/profile/[memberId]/page.tsx
@@ -103,9 +103,6 @@ const Profile = React.memo(function ProfilePage({ params }: { params: { memberId
 								{t('common.MEMBER')} {t('common.NOT_FOUND')}!
 							</Text>
 
-							<Text className=" font-light text-center text-gray-400">
-								{t('pages.profile.MEMBER_NOT_FOUND_MSG_1')}
-							</Text>
 							<Text className=" font-light text-center text-gray-400">
 								{t('pages.profile.MEMBER_NOT_FOUND_MSG_1')}
 							</Text>
diff --git a/apps/web/lib/features/manual-time/add-manual-time-modal.tsx b/apps/web/lib/features/manual-time/add-manual-time-modal.tsx
index 9c9a63431..c2b4ee861 100644
--- a/apps/web/lib/features/manual-time/add-manual-time-modal.tsx
+++ b/apps/web/lib/features/manual-time/add-manual-time-modal.tsx
@@ -152,7 +152,7 @@ export function AddManualTimeModal(props: IAddManualTimeModalProps) {
 			<form onSubmit={handleSubmit} className="text-sm w-[90%] md:w-full  flex flex-col justify-between gap-4">
 				<div className="flex flex-col">
 					<label className="block text-gray-500 mb-1">
-						Date<span className="text-[#de5505e1] ml-1">*</span>
+						{t('manualTime.DATE')}<span className="text-[#de5505e1] ml-1">*</span>
 					</label>
 					<DatePicker
 						buttonVariant={'link'}
@@ -167,7 +167,7 @@ export function AddManualTimeModal(props: IAddManualTimeModalProps) {
 										"w-[230px] justify-start text-left font-normal text-black  h-10 border border-transparent dark:border-transparent",
 										!date && "text-muted-foreground"
 									)}>
-									{date ? format(date, "PPP") : <span>Pick a date</span>}
+									{date ? format(date, "PPP") : <span>{t('manualTime.PICK_A_DATE')}</span>}
 								</Button>
 							</>
 						}
@@ -198,7 +198,7 @@ export function AddManualTimeModal(props: IAddManualTimeModalProps) {
 				<div className="flex items-center">
 					<div className=" w-[48%] mr-[4%]">
 						<label className="block text-gray-500 mb-1">
-							Start time<span className="text-[#de5505e1] ml-1">*</span>
+							{t('manualTime.START_TIME')}<span className="text-[#de5505e1] ml-1">*</span>
 						</label>
 						<input
 							type="time"
@@ -211,7 +211,7 @@ export function AddManualTimeModal(props: IAddManualTimeModalProps) {
 
 					<div className=" w-[48%]">
 						<label className="block text-gray-500 mb-1">
-							End time<span className="text-[#de5505e1] ml-1">*</span>
+							{t('manualTime.END_TIME')}<span className="text-[#de5505e1] ml-1">*</span>
 						</label>
 
 						<input
@@ -225,7 +225,7 @@ export function AddManualTimeModal(props: IAddManualTimeModalProps) {
 				</div>
 
 				<div className=" flex items-center">
-					<label className="block text-primary mb-1">{`${params === 'AddManuelTime' ? 'Total hours' : 'Added hours'}`}: </label>
+					<label className="block text-primary mb-1">{`${params === 'AddManuelTime' ? t('timer.TOTAL_HOURS') : t('manualTime.ADDED_HOURS')}`}: </label>
 					<div className="ml-[10px] p-1 flex items-center font-semibold dark:border-regal-rose  pr-3">
 						<div className="mr-[10px] bg-gradient-to-tl text-[#3826A6]  rounded-full ">
 							<IoTime
@@ -239,7 +239,7 @@ export function AddManualTimeModal(props: IAddManualTimeModalProps) {
 
 				<div className="">
 					<label className="block text-gray-500 mb-1">
-						Team<span className="text-[#de5505e1] ml-1">*</span>
+						{t('manualTime.TEAM')}<span className="text-[#de5505e1] ml-1">*</span>
 					</label>
 					<SelectItems
 						defaultValue={activeTeam!}
@@ -257,7 +257,7 @@ export function AddManualTimeModal(props: IAddManualTimeModalProps) {
 
 							<div className="">
 								<label className="block text-gray-500 mb-1">
-									Employee<span className="text-[#de5505e1] ml-1">*</span>
+									{t('manualTime.EMPLOYEE')}<span className="text-[#de5505e1] ml-1">*</span>
 								</label>
 								<SelectItems
 									items={activeTeam?.members ?? []}
@@ -270,7 +270,7 @@ export function AddManualTimeModal(props: IAddManualTimeModalProps) {
 
 							<div className="">
 								<label className="block text-gray-500 mb-1">
-									Task<span className="text-[#de5505e1] ml-1">*</span>
+									{t('manualTime.TASK')}<span className="text-[#de5505e1] ml-1">*</span>
 								</label>
 								<SelectItems
 									items={manualTimeReasons.map((reason) => t(`manualTime.reasons.${reason}`))}
@@ -282,7 +282,7 @@ export function AddManualTimeModal(props: IAddManualTimeModalProps) {
 								/>
 							</div>
 							<div className="flex flex-col">
-								<label className="block text-gray-500 shrink-0">Description (optional)</label>
+								<label className="block text-gray-500 shrink-0">{t('manualTime.DESCRIPTION')} ({t('manualTime.OPTIONAL')})</label>
 								<textarea
 									value={description}
 									placeholder="What did you worked on..."
@@ -296,7 +296,7 @@ export function AddManualTimeModal(props: IAddManualTimeModalProps) {
 
 							<div className="">
 								<label className="block text-gray-500 mb-1">
-									Task<span className="text-[#de5505e1] ml-1">*</span>
+									{t('manualTime.TASK')}<span className="text-[#de5505e1] ml-1">*</span>
 								</label>
 								<SelectItems
 									defaultValue={activeTeamTask}
@@ -309,7 +309,7 @@ export function AddManualTimeModal(props: IAddManualTimeModalProps) {
 							</div>
 
 							<div className="flex flex-col">
-								<label className="block text-gray-500 shrink-0">Description (optional)</label>
+								<label className="block text-gray-500 shrink-0">{t('manualTime.DESCRIPTION')} ({t('manualTime.OPTIONAL')})</label>
 								<textarea
 									value={description}
 									placeholder="What worked on? "
@@ -319,7 +319,7 @@ export function AddManualTimeModal(props: IAddManualTimeModalProps) {
 							</div>
 
 							<div className="">
-								<label className="block text-gray-500 mb-1">Reason (optional)</label>
+								<label className="block text-gray-500 mb-1">{t('manualTime.REASON')} ({t('manualTime.OPTIONAL')})</label>
 								<SelectItems
 									items={manualTimeReasons.map((reason) => t(`manualTime.reasons.${reason}`))}
 									onValueChange={(reason) => setReason(reason)}
diff --git a/apps/web/lib/features/task/daily-plan/task-estimated-count.tsx b/apps/web/lib/features/task/daily-plan/task-estimated-count.tsx
index 94014fd76..a608cc66f 100644
--- a/apps/web/lib/features/task/daily-plan/task-estimated-count.tsx
+++ b/apps/web/lib/features/task/daily-plan/task-estimated-count.tsx
@@ -1,6 +1,7 @@
 import { secondsToTime } from '@app/helpers';
 import { IDailyPlan } from '@app/interfaces';
 import { VerticalSeparator } from 'lib/components';
+import { useTranslations } from 'next-intl';
 
 interface ITaskEstimatedCount {
 	outstandingPlans: any[];
@@ -9,18 +10,19 @@ export function TaskEstimatedCount({ outstandingPlans }: ITaskEstimatedCount) {
 	const element = outstandingPlans?.map((plan: IDailyPlan) => plan.tasks?.map((task) => task));
 	const { timesEstimated, totalTasks } = estimatedTotalTime(element || []);
 	const { h: hour, m: minute } = secondsToTime(timesEstimated || 0);
+	const t = useTranslations()
 
 	return (
 		<div className="flex space-x-10">
 			<div className="flex space-x-2">
-				<span className="text-slate-600 dark:text-slate-200">Estimated:</span>
+				<span className="text-slate-600 dark:text-slate-200">{t('dailyPlan.ESTIMATED')} :</span>
 				<span className="text-slate-900 dark:text-slate-200 font-semibold text-[12px]">
 					{hour}h{minute}m
 				</span>
 			</div>
 			<VerticalSeparator className="border-slate-400" />
 			<div className="flex space-x-2">
-				<span className="text-slate-600 dark:text-slate-200">Total tasks:</span>
+				<span className="text-slate-600 dark:text-slate-200">{t('dailyPlan.TOTAL_TASK')}:</span>
 				<span className="text-slate-900 dark:text-slate-200 font-semibold text-[12px]">{totalTasks}</span>
 			</div>
 		</div>
diff --git a/apps/web/lib/features/team/invite/invite-email-dropdown.tsx b/apps/web/lib/features/team/invite/invite-email-dropdown.tsx
index 9de772ca1..5fda03568 100644
--- a/apps/web/lib/features/team/invite/invite-email-dropdown.tsx
+++ b/apps/web/lib/features/team/invite/invite-email-dropdown.tsx
@@ -5,6 +5,7 @@ import { InviteEmailItem, mapTeamMemberItems } from './invite-email-item';
 import { clsxm } from '@app/utils';
 import { IInviteEmail } from '@app/interfaces';
 import { useSyncRef } from '@app/hooks';
+import { useTranslations } from 'next-intl';
 
 export const InviteEmailDropdown = ({
 	emails,
@@ -18,7 +19,8 @@ export const InviteEmailDropdown = ({
 	selectedEmail: IInviteEmail | undefined;
 	error: string;
 	handleAddNew: (email: string) => void;
-}) => {
+	}) => {
+	const t = useTranslations()
 	const items = useMemo(() => mapTeamMemberItems(emails), [emails]);
 	const $items = useSyncRef(items);
 
@@ -48,7 +50,7 @@ export const InviteEmailDropdown = ({
 				value={emailItem}
 				onChange={onChangeActive}
 				items={items}
-				placeholder={'Team member email address'}
+				placeholder={t('common.TEAM_MEMBER_EMAIL_ADDRESS')}
 				error={error}
 				handleAddNew={handleAddNew}
 				useHandleKeyUp={true}
diff --git a/apps/web/lib/features/user-profile-plans.tsx b/apps/web/lib/features/user-profile-plans.tsx
index 5782b03a5..a42f37f0b 100644
--- a/apps/web/lib/features/user-profile-plans.tsx
+++ b/apps/web/lib/features/user-profile-plans.tsx
@@ -364,6 +364,7 @@ export function PlanHeader({ plan, planMode }: { plan: IDailyPlan; planMode: Fil
 	const [time, setTime] = useState<number>(0);
 	const { updateDailyPlan, updateDailyPlanLoading } = useDailyPlan();
 	const { isTeamManager } = useAuthenticateUser();
+	const t = useTranslations()
 	// Get all tasks's estimations time
 	// Helper function to sum times
 	const sumTimes = (tasks: ITeamTask[], key: any) =>
@@ -396,7 +397,7 @@ export function PlanHeader({ plan, planMode }: { plan: IDailyPlan; planMode: Fil
 				{!editTime && !updateDailyPlanLoading ? (
 					<>
 						<div>
-							<span className="font-medium">Planned time: </span>
+							<span className="font-medium">{t('dailyPlan.PLANNED_TIME')} : </span>
 							<span className="font-semibold">{formatIntegerToHour(plan.workTimePlanned)}</span>
 						</div>
 						{(!checkPastDate(plan.date) || isTeamManager) && (
@@ -437,7 +438,7 @@ export function PlanHeader({ plan, planMode }: { plan: IDailyPlan; planMode: Fil
 			<VerticalSeparator className="h-10" />
 
 			<div className="flex items-center gap-2">
-				<span className="font-medium">Estimated time: </span>
+				<span className="font-medium">{t('dailyPlan.ESTIMATED_TIME')} : </span>
 				<span className="font-semibold">{formatIntegerToHour(estimatedTime / 3600)}</span>
 			</div>
 
@@ -446,7 +447,7 @@ export function PlanHeader({ plan, planMode }: { plan: IDailyPlan; planMode: Fil
 			{/* Total worked time for the plan */}
 			{planMode !== 'Future Tasks' && (
 				<div className="flex items-center gap-2">
-					<span className="font-medium">Total time worked: </span>
+					<span className="font-medium">{t('dailyPlan.TOTAL_TIME_WORKED')} : </span>
 					<span className="font-semibold">{formatIntegerToHour(totalWorkTime / 3600)}</span>
 				</div>
 			)}
@@ -457,15 +458,15 @@ export function PlanHeader({ plan, planMode }: { plan: IDailyPlan; planMode: Fil
 			{planMode !== 'Future Tasks' && (
 				<div>
 					<div className="flex items-center gap-2">
-						<span className="font-medium">Completed tasks: </span>
+						<span className="font-medium">{t('dailyPlan.COMPLETED_TASKS')} : </span>
 						<span className="font-medium">{`${completedTasks}/${totalTasks}`}</span>
 					</div>
 					<div className="flex items-center gap-2">
-						<span className="font-medium">Ready: </span>
+						<span className="font-medium">{t('dailyPlan.READY')}: </span>
 						<span className="font-medium">{readyTasks}</span>
 					</div>
 					<div className="flex items-center gap-2">
-						<span className="font-medium">Left: </span>
+						<span className="font-medium">{t('dailyPlan.LEFT')}: </span>
 						<span className="font-semibold">{totalTasks - completedTasks - readyTasks}</span>
 					</div>
 				</div>
@@ -477,7 +478,7 @@ export function PlanHeader({ plan, planMode }: { plan: IDailyPlan; planMode: Fil
 			{planMode !== 'Future Tasks' && (
 				<div className="flex flex-col gap-3">
 					<div className="flex items-center gap-2">
-						<span className="font-medium">Completion: </span>
+						<span className="font-medium">{t('dailyPlan.COMPLETION')}: </span>
 						<span className="font-semibold">{completionPercent}%</span>
 					</div>
 					<ProgressBar progress={`${completionPercent || 0}%`} showPercents={false} width="100%" />
@@ -488,7 +489,7 @@ export function PlanHeader({ plan, planMode }: { plan: IDailyPlan; planMode: Fil
 			{planMode === 'Future Tasks' && (
 				<div>
 					<div className="flex items-center gap-2">
-						<span className="font-medium">Planned tasks: </span>
+						<span className="font-medium">{t('dailyPlan.PLANNED_TASKS')}: </span>
 						<span className="font-semibold">{totalTasks}</span>
 					</div>
 				</div>
@@ -498,10 +499,14 @@ export function PlanHeader({ plan, planMode }: { plan: IDailyPlan; planMode: Fil
 }
 
 export function EmptyPlans({ planMode }: { planMode?: FilterTabs }) {
+	const t = useTranslations()
+
 	return (
 		<div className="xl:mt-20">
 			<NoData
-				text={`No task planned ${planMode === 'Today Tasks' ? 'today' : ''}`}
+				text={planMode == 'Today Tasks' ?
+					t('dailyPlan.NO_TASK_PLANNED_TODAY') :
+					t('dailyPlan.NO_TASK_PLANNED')}
 				component={<ReaderIcon className="w-14 h-14" />}
 			/>
 		</div>
diff --git a/apps/web/lib/settings/default-issue-type-form.tsx b/apps/web/lib/settings/default-issue-type-form.tsx
index b1b185399..edf5e11ed 100644
--- a/apps/web/lib/settings/default-issue-type-form.tsx
+++ b/apps/web/lib/settings/default-issue-type-form.tsx
@@ -139,7 +139,7 @@ export const DefaultIssueTypeForm = () => {
 									</div>
 								) : (
 									<StatusesListCard
-										statusTitle={'No Default Issue Type'}
+										statusTitle={t('pages.settingsTeam.NO_DEFAULT_ISSUE_TYPE')}
 										bgColor={''}
 										statusIcon={''}
 										showDeleteButton={false}
diff --git a/apps/web/locales/ar.json b/apps/web/locales/ar.json
index 113e67f73..72d30d501 100644
--- a/apps/web/locales/ar.json
+++ b/apps/web/locales/ar.json
@@ -150,6 +150,7 @@
 		"CANCEL": "إلغاء",
 		"DISCARD": "تجاهل",
 		"EXISTING_MEMBER": "عضو بالفعل",
+		"TEAM_MEMBER_EMAIL_ADDRESS": "عنوان البريد الإلكتروني لعضو الفريق",
 		"NEW_MEMBER": "أصبح عضوًا",
 		"BACK": "رجوع",
 		"JOIN_REQUEST": "طلب الانضمام",
@@ -421,7 +422,8 @@
 			"VERSIONS": "الإصدارات",
 			"LIST_OF_VERSONS": "قائمة الإصدارات",
 			"ISSUETYPE": "أنواع القضايا",
-			"DEFAULT_ISSUE_TYPE": "Default Issue Type",
+			"DEFAULT_ISSUE_TYPE": "نوع المشكلة الافتراضي",
+			"NO_DEFAULT_ISSUE_TYPE": "لا يوجد نوع مشكلة افتراضي",
 			"LIST_OF_ISSUES": "قائمة القضايا",
 			"RELATED_ISSUE_TYPE": "أنواع القضايا ذات الصلة",
 			"LIST_OF_RELATED_TYPE": "قائمة الأنواع ذات الصلة",
@@ -589,6 +591,18 @@
 		"REMOVE_FROM_THIS_PLAN": "إزالة من هذه الخطة",
 		"CREATE_A_PLAN_FOR_TODAY": "إنشاء خطة لليوم",
 		"TODAY_PLAN_SUB_TITLE": "لا توجد خطة لليوم",
+		"NO_TASK_PLANNED": "لم يتم التخطيط لأي مهمة",
+		"NO_TASK_PLANNED_TODAY": "لم يتم التخطيط لأي مهمة اليوم",
+		"PLANNED_TIME": "الوقت المخطط",
+		"ESTIMATED_TIME": "الوقت المقدر",
+		"TOTAL_TIME_WORKED": "إجمالي الوقت المستغرق",
+		"COMPLETED_TASKS": "المهام المكتملة",
+		"READY": "جاهز",
+		"LEFT": "متبقي",
+		"COMPLETION": "إتمام",
+		"PLANNED_TASKS": "المهمة المخططة",
+		"ESTIMATED": "تقديري",
+		"TOTAL_TASK": "إجمالي المهام",
 		"DAILY_PLAN_DESCRIPTION": "'الخطة اليومية' تساعد في تنظيم عملية العمل لتحقيق أفضل النتائج",
 		"SUGGESTS_TO_ADD_TASK_TO_TODAY_PLAN": "لم تكن هذه المهمة مخططة لخطة اليوم. هل ترغب في إضافة شيء إلى الخطة؟"
 	},
@@ -652,6 +666,17 @@
 		}
 	},
 	"manualTime": {
+		"ADDED_HOURS": "الساعات المضافة",
+		"DATE": "التاريخ",
+		"PICK_A_DATE": "اختر تاريخًا",
+		"START_TIME": "وقت البدء",
+		"END_TIME": "وقت الانتهاء",
+		"TEAM": "فريق",
+		"EMPLOYEE": "موظف",
+		"TASK": "مهمة",
+		"DESCRIPTION": "وصف",
+		"OPTIONAL": "اختياري",
+		"REASON": "السبب",
 		"reasons": {
 			"DEFAULT": "فقط الوقت اليدوي",
 			"LOST_ELECTRICITY": "انقطاع الكهرباء",
diff --git a/apps/web/locales/bg.json b/apps/web/locales/bg.json
index 93bb3a909..bcf297253 100644
--- a/apps/web/locales/bg.json
+++ b/apps/web/locales/bg.json
@@ -150,6 +150,7 @@
 		"EXISTING_MEMBER": "Вече член",
 		"NEW_MEMBER": "Стани член",
 		"BACK": "Назад",
+		"TEAM_MEMBER_EMAIL_ADDRESS": "Имейл адрес на член на екипа",
 		"JOIN_REQUEST": "Искане за присъединяване",
 		"DONT_HAVE_ACCOUNT": "Нямате профил?",
 		"REGISTER": "Регистрация",
@@ -421,7 +422,8 @@
 			"VERSIONS": "Версии",
 			"LIST_OF_VERSONS": "Списък с версии",
 			"ISSUETYPE": "Типове проблеми",
-			"DEFAULT_ISSUE_TYPE": "Default Issue Type",
+			"DEFAULT_ISSUE_TYPE": "Тип на проблема по подразбиране",
+			"NO_DEFAULT_ISSUE_TYPE": "Няма тип на проблема по подразбиране",
 			"LIST_OF_ISSUES": "Списък с проблеми",
 			"RELATED_ISSUE_TYPE": "Свързани типове проблеми",
 			"LIST_OF_RELATED_TYPE": "Списък със свързани типове",
@@ -589,6 +591,18 @@
 		"REMOVE_FROM_THIS_PLAN": "Премахни от този план",
 		"CREATE_A_PLAN_FOR_TODAY": "Създайте план за днес",
 		"TODAY_PLAN_SUB_TITLE": "Няма план за днес",
+		"NO_TASK_PLANNED": "Няма планирана задача",
+		"NO_TASK_PLANNED_TODAY": "Няма планирана задача Днес",
+		"PLANNED_TIME": "Планирано време",
+		"ESTIMATED_TIME": "Оценено време",
+		"TOTAL_TIME_WORKED": "Общо отработено време",
+		"COMPLETED_TASKS": "Завършени задачи",
+		"READY": "Готов",
+		"LEFT": "Останало",
+		"COMPLETION": "Завършване",
+		"PLANNED_TASKS": "Планирана задача",
+		"ESTIMATED": "Оценено",
+		"TOTAL_TASK": "Общо задачи",
 		"DAILY_PLAN_DESCRIPTION": "'Дневният план' помага да се организира работният процес за постигане на най-добри резултати",
 		"SUGGESTS_TO_ADD_TASK_TO_TODAY_PLAN": "Тази задача не беше планирана за днешния план. Искате ли да добавите към плана?"
 	},
@@ -652,6 +666,17 @@
 		}
 	},
 	"manualTime": {
+		"ADDED_HOURS": "Добавени часове",
+		"DATE": "Дата",
+		"PICK_A_DATE": "Изберете дата",
+		"START_TIME": "Начален час",
+		"END_TIME": "Краен час",
+		"TEAM": "Екип",
+		"EMPLOYEE": "Служител",
+		"TASK": "Задача",
+		"DESCRIPTION": "Описание",
+		"OPTIONAL": "По избор",
+		"REASON": "Причина",
 		"reasons": {
 			"DEFAULT": "Само ръчно време",
 			"LOST_ELECTRICITY": "Изгубено електрическо захранване",
diff --git a/apps/web/locales/de.json b/apps/web/locales/de.json
index 8a8de00d8..4cd09c041 100644
--- a/apps/web/locales/de.json
+++ b/apps/web/locales/de.json
@@ -150,6 +150,7 @@
 		"EXISTING_MEMBER": "Bereits Mitglied",
 		"NEW_MEMBER": "Mitglied werden",
 		"BACK": "Zurück",
+		"TEAM_MEMBER_EMAIL_ADDRESS": "E-Mail-Adresse des Teammitglieds",
 		"DONT_HAVE_ACCOUNT": "Don't have an account?",
 		"REGISTER": "Register Now!",
 		"JOIN_REQUEST": "Beitrittsanfrage",
@@ -421,7 +422,8 @@
 			"VERSIONS": "Versionen",
 			"LIST_OF_VERSONS": "Liste der Versionen",
 			"ISSUETYPE": "Tickettypen",
-			"DEFAULT_ISSUE_TYPE": "Default Issue Type",
+			"DEFAULT_ISSUE_TYPE": "Standardproblemtyp",
+			"NO_DEFAULT_ISSUE_TYPE": "Kein Standardproblemtyp",
 			"LIST_OF_ISSUES": "Liste der Tickets",
 			"RELATED_ISSUE_TYPE": "Verwandte Tickettypen",
 			"LIST_OF_RELATED_TYPE": "Liste verwandter Typen",
@@ -589,6 +591,18 @@
 		"REMOVE_FROM_THIS_PLAN": "Aus diesem Plan entfernen",
 		"CREATE_A_PLAN_FOR_TODAY": "Erstellen Sie einen Plan für heute",
 		"TODAY_PLAN_SUB_TITLE": "Es gibt keinen Plan für heute",
+		"NO_TASK_PLANNED": "Keine Aufgabe geplant",
+		"NO_TASK_PLANNED_TODAY": "Keine Aufgabe für heute geplant",
+		"PLANNED_TIME": "Geplante Zeit",
+		"ESTIMATED_TIME": "Geschätzte Zeit",
+		"TOTAL_TIME_WORKED": "Gesamtarbeitszeit",
+		"COMPLETED_TASKS": "Abgeschlossene Aufgaben",
+		"READY": "Bereit",
+		"LEFT": "Übrig",
+		"COMPLETION": "Abschluss",
+		"PLANNED_TASKS": "Geplante Aufgabe",
+		"ESTIMATED": "Geschätzt",
+		"TOTAL_TASK": "Gesamte Aufgaben",
 		"DAILY_PLAN_DESCRIPTION": "'Tagesplan' hilft, den Arbeitsprozess zu organisieren, um die besten Ergebnisse zu erzielen",
 		"SUGGESTS_TO_ADD_TASK_TO_TODAY_PLAN": "Deze taak was niet gepland voor het plan van vandaag. Wilt u iets toevoegen aan het plan?"
 	},
@@ -652,6 +666,17 @@
 		}
 	},
 	"manualTime": {
+		"ADDED_HOURS": "Hinzugefügte Stunden",
+		"DATE": "Datum",
+		"PICK_A_DATE": "Datum auswählen",
+		"START_TIME": "Startzeit",
+		"END_TIME": "Endzeit",
+		"TEAM": "Team",
+		"EMPLOYEE": "Mitarbeiter",
+		"TASK": "Aufgabe",
+		"DESCRIPTION": "Beschreibung",
+		"OPTIONAL": "Optional",
+		"REASON": "Grund",
 		"reasons": {
 			"DEFAULT": "Nur manuelle Zeit",
 			"LOST_ELECTRICITY": "Stromausfall",
diff --git a/apps/web/locales/en.json b/apps/web/locales/en.json
index 24358b695..7790130f5 100644
--- a/apps/web/locales/en.json
+++ b/apps/web/locales/en.json
@@ -149,6 +149,7 @@
 		"DISCARD": "Discard",
 		"EXISTING_MEMBER": "Already a Member",
 		"NEW_MEMBER": "Become a Member",
+		"TEAM_MEMBER_EMAIL_ADDRESS": "Team member email address",
 		"BACK": "Back",
 		"DONT_HAVE_ACCOUNT": "Don't have an account?",
 		"REGISTER": "Register Now!",
@@ -364,6 +365,7 @@
 			"TASK_LABELS": "Task Labels",
 			"ISSUE_TYPES": "Issue Types",
 			"DEFAULT_ISSUE_TYPE": "Default Issue Type",
+			"NO_DEFAULT_ISSUE_TYPE": "No Default Issue Type",
 			"RELATED_TYPE": "Related Type",
 			"INVITATION_HEADING_TITLE": "Invitations",
 			"CREATE_NEW_STATUSES": "Create new Statuses",
@@ -589,6 +591,18 @@
 		"REMOVE_FROM_THIS_PLAN": "Remove from this plan",
 		"CREATE_A_PLAN_FOR_TODAY": "Create a Plan for Today",
 		"TODAY_PLAN_SUB_TITLE": " There is no plan for Today",
+		"NO_TASK_PLANNED": "No task planned",
+		"NO_TASK_PLANNED_TODAY": "No task planned Today",
+		"PLANNED_TIME": "Planned time",
+		"ESTIMATED_TIME": "Estimated time",
+		"TOTAL_TIME_WORKED": "Total time worked",
+		"COMPLETED_TASKS": "Completed tasks",
+		"READY": "Ready",
+		"LEFT": "Left",
+		"COMPLETION": "Completion",
+		"PLANNED_TASKS": "Planned task",
+		"ESTIMATED": "Estimated",
+		"TOTAL_TASK": "Total tasks",
 		"DAILY_PLAN_DESCRIPTION": "'Daily Plan' helps organize the work process to achieve the best results",
 		"SUGGESTS_TO_ADD_TASK_TO_TODAY_PLAN": "This task was not planned for Today's plan. Would you like to add to the plan?"
 	},
@@ -652,6 +666,17 @@
 		}
 	},
 	"manualTime": {
+		"ADDED_HOURS": "Added Hours",
+		"DATE": "Date",
+		"PICK_A_DATE": "Pick a Date",
+		"START_TIME": "Start Time",
+		"END_TIME": "End Time",
+		"TEAM": "Team",
+		"EMPLOYEE": "Employee",
+		"TASK": "Task",
+		"DESCRIPTION": "Description",
+		"OPTIONAL": "Optional",
+		"REASON": "Reason ",
 		"reasons": {
 			"DEFAULT": "Only manual time",
 			"LOST_ELECTRICITY": "Lost electricity",
diff --git a/apps/web/locales/es.json b/apps/web/locales/es.json
index e7ca845f2..35d4845da 100644
--- a/apps/web/locales/es.json
+++ b/apps/web/locales/es.json
@@ -150,6 +150,7 @@
 		"CANCEL": "Cancelar",
 		"DISCARD": "Descartar",
 		"EXISTING_MEMBER": "Ya es miembro",
+		"TEAM_MEMBER_EMAIL_ADDRESS": "Dirección de correo electrónico del miembro del equipo",
 		"NEW_MEMBER": "Convertirse en miembro",
 		"BACK": "Atrás",
 		"JOIN_REQUEST": "Solicitud para unirse",
@@ -421,7 +422,8 @@
 			"VERSIONS": "Versiones",
 			"LIST_OF_VERSONS": "Lista de versiones",
 			"ISSUETYPE": "Tipos de problemas",
-			"DEFAULT_ISSUE_TYPE": "Default Issue Type",
+			"DEFAULT_ISSUE_TYPE": "Tipo de problema predeterminado",
+			"NO_DEFAULT_ISSUE_TYPE": "Sin tipo de problema predeterminado",
 			"LIST_OF_ISSUES": "Lista de problemas",
 			"RELATED_ISSUE_TYPE": "Tipos de problemas relacionados",
 			"LIST_OF_RELATED_TYPE": "Lista de tipos relacionados",
@@ -589,6 +591,18 @@
 		"REMOVE_FROM_THIS_PLAN": "Eliminar de este plan",
 		"CREATE_A_PLAN_FOR_TODAY": "Crear un plan para hoy",
 		"TODAY_PLAN_SUB_TITLE": "No hay plan para hoy",
+		"NO_TASK_PLANNED": "Ninguna tarea planificada",
+		"NO_TASK_PLANNED_TODAY": "Ninguna tarea planificada para hoy",
+		"PLANNED_TIME": "Tiempo planificado",
+		"ESTIMATED_TIME": "Tiempo estimado",
+		"TOTAL_TIME_WORKED": "Tiempo total trabajado",
+		"COMPLETED_TASKS": "Tareas completadas",
+		"READY": "Listo",
+		"LEFT": "Restante",
+		"COMPLETION": "Finalización",
+		"PLANNED_TASKS": "Tarea planificada",
+		"ESTIMATED": "Estimado",
+		"TOTAL_TASK": "Tareas totales",
 		"DAILY_PLAN_DESCRIPTION": "'Plan diario' ayuda a organizar el proceso de trabajo para lograr los mejores resultados",
 		"SUGGESTS_TO_ADD_TASK_TO_TODAY_PLAN": "Esta tarea no estaba prevista en el plan de hoy. ¿Te gustaría añadir algo al plan?"
 	},
@@ -652,6 +666,17 @@
 		}
 	},
 	"manualTime": {
+		"ADDED_HOURS": "Horas añadidas",
+		"DATE": "Fecha",
+		"PICK_A_DATE": "Elegir una fecha",
+		"START_TIME": "Hora de inicio",
+		"END_TIME": "Hora de finalización",
+		"TEAM": "Equipo",
+		"EMPLOYEE": "Empleado",
+		"TASK": "Tarea",
+		"DESCRIPTION": "Descripción",
+		"OPTIONAL": "Opcional",
+		"REASON": "Razón",
 		"reasons": {
 			"DEFAULT": "Solo tiempo manual",
 			"LOST_ELECTRICITY": "Corte de electricidad",
diff --git a/apps/web/locales/fr.json b/apps/web/locales/fr.json
index 123b392b6..36440d204 100644
--- a/apps/web/locales/fr.json
+++ b/apps/web/locales/fr.json
@@ -152,6 +152,7 @@
 		"NEW_MEMBER": "Devenir membre",
 		"BACK": "Retour",
 		"JOIN_REQUEST": "Demande de rejoindre",
+		"TEAM_MEMBER_EMAIL_ADDRESS": "Adresse e-mail du membre de l'équipe",
 		"PERMISSION": "Permission",
 		"SEARCH": "Rechercher",
 		"ADD_PARENT": "Ajouter un parent",
@@ -363,7 +364,8 @@
 			"TASK_SIZES": "Tailles des tâches",
 			"TASK_LABELS": "Étiquettes des tâches",
 			"ISSUE_TYPES": "Types de problèmes",
-			"DEFAULT_ISSUE_TYPE": "Type de problèmes par defaut",
+			"DEFAULT_ISSUE_TYPE": "Type de problème par défaut",
+			"NO_DEFAULT_ISSUE_TYPE": "Aucun type de problème par défaut",
 			"RELATED_TYPE": "Type connexe",
 			"INVITATION_HEADING_TITLE": "Invitations",
 			"CREATE_NEW_STATUSES": "Créer de nouveaux statuts",
@@ -589,6 +591,18 @@
 		"REMOVE_FROM_THIS_PLAN": "Retirer de ce plan",
 		"CREATE_A_PLAN_FOR_TODAY": "Créer un plan pour aujourd'hui",
 		"TODAY_PLAN_SUB_TITLE": "Il n'y a pas de plan pour aujourd'hui",
+		"NO_TASK_PLANNED": "Aucune tâche prévue",
+		"NO_TASK_PLANNED_TODAY": "Aucune tâche prévue pour aujourd'hui",
+		"PLANNED_TIME": "Temps planifié",
+		"ESTIMATED_TIME": "Temps estimé",
+		"TOTAL_TIME_WORKED": "Temps total travaillé",
+		"COMPLETED_TASKS": "Tâches terminées",
+		"READY": "Prêt",
+		"LEFT": "Restant",
+		"COMPLETION": "Achèvement",
+		"PLANNED_TASKS": "Tâche planifiées",
+		"ESTIMATED": "Estimé",
+		"TOTAL_TASK": "Tâches totales",
 		"DAILY_PLAN_DESCRIPTION": "'Plan quotidien' aide à organiser le processus de travail pour obtenir les meilleurs résultats",
 		"SUGGESTS_TO_ADD_TASK_TO_TODAY_PLAN": "Cette tâche n'était pas prévue dans le planning d'aujourd'hui. Souhaitez-vous l'ajouter au planning ?"
 	},
@@ -652,6 +666,17 @@
 		}
 	},
 	"manualTime": {
+		"ADDED_HOURS": "Heures ajoutées",
+		"DATE": "Date",
+		"PICK_A_DATE": "Choisir une date",
+		"START_TIME": "Heure de début",
+		"END_TIME": "Heure de fin",
+		"TEAM": "Équipe",
+		"EMPLOYEE": "Employé",
+		"TASK": "Tâche",
+		"DESCRIPTION": "Description",
+		"OPTIONAL": "Optionnel",
+		"REASON": "Raison",
 		"reasons": {
 			"DEFAULT": "Seulement le temps manuel",
 			"LOST_ELECTRICITY": "Panne d'électricité",
diff --git a/apps/web/locales/he.json b/apps/web/locales/he.json
index 947a2cb34..80cd25ecb 100644
--- a/apps/web/locales/he.json
+++ b/apps/web/locales/he.json
@@ -150,6 +150,7 @@
 		"CANCEL": "בטל",
 		"DISCARD": "בטל",
 		"EXISTING_MEMBER": "כבר חבר",
+		"TEAM_MEMBER_EMAIL_ADDRESS": "כתובת אימייל של חבר צוות",
 		"NEW_MEMBER": "הפוך לחבר",
 		"BACK": "חזור",
 		"JOIN_REQUEST": "בקש הצטרפות",
@@ -421,7 +422,8 @@
 			"VERSIONS": "גרסאות",
 			"LIST_OF_VERSONS": "רשימת גרסאות",
 			"ISSUETYPE": "סוגי בעיות",
-			"DEFAULT_ISSUE_TYPE": "Default Issue Type",
+			"DEFAULT_ISSUE_TYPE": "סוג ברירת מחדל של בעיה",
+			"NO_DEFAULT_ISSUE_TYPE": "אין סוג ברירת מחדל של בעיה",
 			"LIST_OF_ISSUES": "רשימת בעיות",
 			"RELATED_ISSUE_TYPE": "סוגי בעיות קשורות",
 			"LIST_OF_RELATED_TYPE": "רשימת סוגים קשורים",
@@ -589,6 +591,18 @@
 		"REMOVE_FROM_THIS_PLAN": "הסר מתוכנית זו",
 		"CREATE_A_PLAN_FOR_TODAY": "צור תוכנית להיום",
 		"TODAY_PLAN_SUB_TITLE": "אין תוכנית להיום",
+		"NO_TASK_PLANNED": "אין משימה מתוכננת",
+		"NO_TASK_PLANNED_TODAY": "אין משימה מתוכננת להיום",
+		"PLANNED_TIME": "זמן מתוכנן",
+		"ESTIMATED_TIME": "זמן משוער",
+		"TOTAL_TIME_WORKED": "זמן עבודה כולל",
+		"COMPLETED_TASKS": "משימות שהושלמו",
+		"READY": "מוכן",
+		"LEFT": "נותר",
+		"COMPLETION": "השלמה",
+		"PLANNED_TASKS": "משימה מתוכננת",
+		"ESTIMATED": "משוער",
+		"TOTAL_TASK": "סך כל המשימות",
 		"DAILY_PLAN_DESCRIPTION": "'תוכנית יומית' עוזרת לארגן את תהליך העבודה להשגת התוצאות הטובות ביותר",
 		"SUGGESTS_TO_ADD_TASK_TO_TODAY_PLAN": "משימה זו לא תוכננה עבור התוכנית של היום. האם תרצה להוסיף לתוכנית?"
 	},
@@ -652,6 +666,17 @@
 		}
 	},
 	"manualTime": {
+		"ADDED_HOURS": "שעות נוספות",
+		"DATE": "תַאֲרִיך",
+		"PICK_A_DATE": "בחר תאריך",
+		"START_TIME": "שעת התחלה",
+		"END_TIME": "שעת סיום",
+		"TEAM": "צוות",
+		"EMPLOYEE": "עוֹבֵד",
+		"TASK": "מְשִׂימָה",
+		"DESCRIPTION": "תיאור",
+		"OPTIONAL": "אופציונאלי",
+		"REASON": "סִיבָּה",
 		"reasons": {
 			"DEFAULT": "רק זמן ידני",
 			"LOST_ELECTRICITY": "הפסקת חשמל",
diff --git a/apps/web/locales/it.json b/apps/web/locales/it.json
index 1dd2be19b..bc7c6b3bc 100644
--- a/apps/web/locales/it.json
+++ b/apps/web/locales/it.json
@@ -150,6 +150,7 @@
 		"EXISTING_MEMBER": "Già un Membro",
 		"NEW_MEMBER": "Diventa un Membro",
 		"BACK": "Indietro",
+		"TEAM_MEMBER_EMAIL_ADDRESS": "Indirizzo email del membro del team",
 		"DONT_HAVE_ACCOUNT": "Non hai un account?",
 		"REGISTER": "Registrati Ora!",
 		"JOIN_REQUEST": "Richiesta di Partecipazione",
@@ -421,7 +422,8 @@
 			"VERSIONS": "Versioni",
 			"LIST_OF_VERSONS": "Elenco delle Versioni",
 			"ISSUETYPE": "Tipi di Problema",
-			"DEFAULT_ISSUE_TYPE": "Default Issue Type",
+			"DEFAULT_ISSUE_TYPE": "Tipo di problema predefinito",
+			"NO_DEFAULT_ISSUE_TYPE": "Nessun tipo di problema predefinito",
 			"LIST_OF_ISSUES": "Elenco dei Problemi",
 			"RELATED_ISSUE_TYPE": "Tipi di Problema Collegati",
 			"LIST_OF_RELATED_TYPE": "Elenco dei Tipi Collegati",
@@ -589,6 +591,18 @@
 		"REMOVE_FROM_THIS_PLAN": "Rimuovi da questo piano",
 		"CREATE_A_PLAN_FOR_TODAY": "Crea un piano per oggi",
 		"TODAY_PLAN_SUB_TITLE": "Non c'è nessun piano per oggi",
+		"NO_TASK_PLANNED": "Nessun compito pianificato",
+		"NO_TASK_PLANNED_TODAY": "Nessun compito pianificato per oggi",
+		"PLANNED_TIME": "Tempo pianificato",
+		"ESTIMATED_TIME": "Tempo stimato",
+		"TOTAL_TIME_WORKED": "Tempo totale lavorato",
+		"COMPLETED_TASKS": "Compiti completati",
+		"READY": "Pronto",
+		"LEFT": "Rimasto",
+		"COMPLETION": "Completamento",
+		"PLANNED_TASKS": "Compito pianificato",
+		"ESTIMATED": "Stimato",
+		"TOTAL_TASK": "Compiti totali",
 		"DAILY_PLAN_DESCRIPTION": "'Piano giornaliero' aiuta a organizzare il processo di lavoro per ottenere i migliori risultati",
 		"SUGGESTS_TO_ADD_TASK_TO_TODAY_PLAN": "Questa attività non era pianificata per il piano di oggi. Vuoi aggiungerla al piano?"
 	},
@@ -652,6 +666,17 @@
 		}
 	},
 	"manualTime": {
+		"ADDED_HOURS": "Ore aggiunte",
+		"DATE": "Data",
+		"PICK_A_DATE": "Seleziona una data",
+		"START_TIME": "Orario di inizio",
+		"END_TIME": "Orario di fine",
+		"TEAM": "Squadra",
+		"EMPLOYEE": "Dipendente",
+		"TASK": "Compito",
+		"DESCRIPTION": "Descrizione",
+		"OPTIONAL": "Opzionale",
+		"REASON": "Motivo",
 		"reasons": {
 			"DEFAULT": "Solo tempo manuale",
 			"LOST_ELECTRICITY": "Interruzione di corrente",
diff --git a/apps/web/locales/nl.json b/apps/web/locales/nl.json
index bdd1434af..bce640e44 100644
--- a/apps/web/locales/nl.json
+++ b/apps/web/locales/nl.json
@@ -150,6 +150,7 @@
 		"DISCARD": "Negeren",
 		"EXISTING_MEMBER": "Al lid",
 		"NEW_MEMBER": "Word lid",
+		"TEAM_MEMBER_EMAIL_ADDRESS": "E-mailadres van teamlid",
 		"BACK": "Terug",
 		"JOIN_REQUEST": "Lid worden aanvragen",
 		"PERMISSION": "Machtiging",
@@ -421,7 +422,8 @@
 			"VERSIONS": "Versies",
 			"LIST_OF_VERSONS": "Lijst met versies",
 			"ISSUETYPE": "Probleemtypen",
-			"DEFAULT_ISSUE_TYPE": "Default Issue Type",
+			"DEFAULT_ISSUE_TYPE": "Standaard probleemtype",
+			"NO_DEFAULT_ISSUE_TYPE": "Geen standaard probleemtype",
 			"LIST_OF_ISSUES": "Lijst met problemen",
 			"RELATED_ISSUE_TYPE": "Gerelateerde probleemtypen",
 			"LIST_OF_RELATED_TYPE": "Lijst met gerelateerde typen",
@@ -589,6 +591,18 @@
 		"REMOVE_FROM_THIS_PLAN": "Verwijder uit dit plan",
 		"CREATE_A_PLAN_FOR_TODAY": "Maak een plan voor vandaag",
 		"TODAY_PLAN_SUB_TITLE": "Er is geen plan voor vandaag",
+		"NO_TASK_PLANNED": "Geen taak gepland",
+		"NO_TASK_PLANNED_TODAY": "Geen taak gepland voor vandaag",
+		"PLANNED_TIME": "Geplande tijd",
+		"ESTIMATED_TIME": "Geschatte tijd",
+		"TOTAL_TIME_WORKED": "Totale gewerkte tijd",
+		"COMPLETED_TASKS": "Voltooide taken",
+		"READY": "Klaar",
+		"LEFT": "Over",
+		"COMPLETION": "Voltooiing",
+		"PLANNED_TASKS": "Geplande taak",
+		"ESTIMATED": "Geschat",
+		"TOTAL_TASK": "Totale taken",
 		"DAILY_PLAN_DESCRIPTION": "'Dagelijkse planning' helpt om het werkproces te organiseren om de beste resultaten te behalen",
 		"SUGGESTS_TO_ADD_TASK_TO_TODAY_PLAN": "Diese Aufgabe war für den heutigen Plan nicht vorgesehen. Möchten Sie den Plan ergänzen?"
 	},
@@ -652,6 +666,17 @@
 		}
 	},
 	"manualTime": {
+		"ADDED_HOURS": "Toegevoegde uren",
+		"DATE": "Datum",
+		"PICK_A_DATE": "Kies een datum",
+		"START_TIME": "Starttijd",
+		"END_TIME": "Eindtijd",
+		"TEAM": "Team",
+		"EMPLOYEE": "Werknemer",
+		"TASK": "Taak",
+		"DESCRIPTION": "Beschrijving",
+		"OPTIONAL": "Optioneel",
+		"REASON": "Reden",
 		"reasons": {
 			"DEFAULT": "Alleen handmatige tijd",
 			"LOST_ELECTRICITY": "Stroomuitval",
diff --git a/apps/web/locales/pl.json b/apps/web/locales/pl.json
index 2552f67d4..fb7e6eb2c 100644
--- a/apps/web/locales/pl.json
+++ b/apps/web/locales/pl.json
@@ -151,6 +151,7 @@
 		"NEW_MEMBER": "Zostań Członkiem",
 		"BACK": "Powrót",
 		"DONT_HAVE_ACCOUNT": "Nie masz konta?",
+		"TEAM_MEMBER_EMAIL_ADDRESS": "Adres e-mail członka zespołu",
 		"REGISTER": "Zarejestruj się teraz!",
 		"JOIN_REQUEST": "Prośba o Dołączenie",
 		"PERMISSION": "Uprawnienia",
@@ -421,7 +422,8 @@
 			"VERSIONS": "Wersje",
 			"LIST_OF_VERSONS": "Lista Wersji",
 			"ISSUETYPE": "Typy Problemów",
-			"DEFAULT_ISSUE_TYPE": "Default Issue Type",
+			"DEFAULT_ISSUE_TYPE": "Domyślny typ problemu",
+			"NO_DEFAULT_ISSUE_TYPE": "Brak domyślnego typu problemu",
 			"LIST_OF_ISSUES": "Lista Problemów",
 			"RELATED_ISSUE_TYPE": "Powiązane Typy Problemów",
 			"LIST_OF_RELATED_TYPE": "Lista Powiązanych Typów",
@@ -589,6 +591,18 @@
 		"REMOVE_FROM_THIS_PLAN": "Usuń z tego planu",
 		"CREATE_A_PLAN_FOR_TODAY": "Utwórz plan na dziś",
 		"TODAY_PLAN_SUB_TITLE": "Brak planu na dziś",
+		"NO_TASK_PLANNED": "Brak zaplanowanego zadania",
+		"NO_TASK_PLANNED_TODAY": "Brak zaplanowanego zadania na dziś",
+		"PLANNED_TIME": "Planowany czas",
+		"ESTIMATED_TIME": "Szacowany czas",
+		"TOTAL_TIME_WORKED": "Łączny czas pracy",
+		"COMPLETED_TASKS": "Wykonane zadania",
+		"READY": "Gotowy",
+		"LEFT": "Pozostało",
+		"COMPLETION": "Ukończenie",
+		"PLANNED_TASKS": "Planowane zadanie",
+		"ESTIMATED": "Szacowany",
+		"TOTAL_TASK": "Łączna liczba zadań",
 		"DAILY_PLAN_DESCRIPTION": "'Plan dnia' pomaga zorganizować proces pracy, aby osiągnąć najlepsze wyniki",
 		"SUGGESTS_TO_ADD_TASK_TO_TODAY_PLAN": "To zadanie nie było zaplanowane na dzisiejszy plan. Czy chcesz dodać do planu?"
 	},
@@ -652,6 +666,17 @@
 		}
 	},
 	"manualTime": {
+		"ADDED_HOURS": "Dodane godziny",
+		"DATE": "Data",
+		"PICK_A_DATE": "Wybierz datę",
+		"START_TIME": "Czas rozpoczęcia",
+		"END_TIME": "Czas zakończenia",
+		"TEAM": "Zespół",
+		"EMPLOYEE": "Pracownik",
+		"TASK": "Zadanie",
+		"DESCRIPTION": "Opis",
+		"OPTIONAL": "Opcjonalny",
+		"REASON": "Powód",
 		"reasons": {
 			"DEFAULT": "Tylko czas ręczny",
 			"LOST_ELECTRICITY": "Utrata zasilania",
diff --git a/apps/web/locales/pt.json b/apps/web/locales/pt.json
index d9e063210..da74d6566 100644
--- a/apps/web/locales/pt.json
+++ b/apps/web/locales/pt.json
@@ -151,6 +151,7 @@
 		"NEW_MEMBER": "Tornar-se Membro",
 		"BACK": "Voltar",
 		"DONT_HAVE_ACCOUNT": "Não tem uma conta?",
+		"TEAM_MEMBER_EMAIL_ADDRESS": "Endereço de e-mail do membro da equipe",
 		"REGISTER": "Registre-se agora!",
 		"JOIN_REQUEST": "Pedido para Entrar",
 		"PERMISSION": "Permissão",
@@ -421,7 +422,8 @@
 			"VERSIONS": "Versões",
 			"LIST_OF_VERSONS": "Lista de Versões",
 			"ISSUETYPE": "Tipos de Problema",
-			"DEFAULT_ISSUE_TYPE": "Default Issue Type",
+			"DEFAULT_ISSUE_TYPE": "Tipo de problema padrão",
+			"NO_DEFAULT_ISSUE_TYPE": "Nenhum tipo de problema padrão",
 			"LIST_OF_ISSUES": "Lista de Problemas",
 			"RELATED_ISSUE_TYPE": "Tipos de Problema Relacionados",
 			"LIST_OF_RELATED_TYPE": "Lista de Tipos Relacionados",
@@ -589,6 +591,18 @@
 		"REMOVE_FROM_THIS_PLAN": "Remover deste plano",
 		"CREATE_A_PLAN_FOR_TODAY": "Criar um plano para hoje",
 		"TODAY_PLAN_SUB_TITLE": "Não há plano para hoje",
+		"NO_TASK_PLANNED": "Nenhuma tarefa planejada",
+		"NO_TASK_PLANNED_TODAY": "Nenhuma tarefa planejada para hoje",
+		"PLANNED_TIME": "Tempo planejado",
+		"ESTIMATED_TIME": "Tempo estimado",
+		"TOTAL_TIME_WORKED": "Tempo total trabalhado",
+		"COMPLETED_TASKS": "Tarefas concluídas",
+		"READY": "Pronto",
+		"LEFT": "Restante",
+		"COMPLETION": "Conclusão",
+		"PLANNED_TASKS": "Tarefa planejada",
+		"ESTIMATED": "Estimado",
+		"TOTAL_TASK": "Tarefas totais",
 		"DAILY_PLAN_DESCRIPTION": "'Plano diário' ajuda a organizar o processo de trabalho para obter os melhores resultados",
 		"SUGGESTS_TO_ADD_TASK_TO_TODAY_PLAN": "Esta tarefa não foi planeada no plano de hoje. Gostaria de acrescentar ao plano?"
 	},
@@ -652,6 +666,17 @@
 		}
 	},
 	"manualTime": {
+		"ADDED_HOURS": "Horas adicionadas",
+		"DATE": "Data",
+		"PICK_A_DATE": "Escolher uma data",
+		"START_TIME": "Hora de início",
+		"END_TIME": "Hora de término",
+		"TEAM": "Equipe",
+		"EMPLOYEE": "Empregado",
+		"TASK": "Tarefa",
+		"DESCRIPTION": "Descrição",
+		"OPTIONAL": "Opcional",
+		"REASON": "Razão",
 		"reasons": {
 			"DEFAULT": "Apenas tempo manual",
 			"LOST_ELECTRICITY": "Perda de eletricidade",
diff --git a/apps/web/locales/ru.json b/apps/web/locales/ru.json
index b2e3c4e09..378875f87 100644
--- a/apps/web/locales/ru.json
+++ b/apps/web/locales/ru.json
@@ -151,6 +151,7 @@
 		"NEW_MEMBER": "Стать участником",
 		"BACK": "Назад",
 		"DONT_HAVE_ACCOUNT": "У вас нет аккаунта?",
+		"TEAM_MEMBER_EMAIL_ADDRESS": "Адрес электронной почты члена команды",
 		"REGISTER": "Зарегистрируйтесь сейчас!",
 		"JOIN_REQUEST": "Запрос на присоединение",
 		"PERMISSION": "Разрешение",
@@ -421,7 +422,8 @@
 			"VERSIONS": "Версии",
 			"LIST_OF_VERSONS": "Список версий",
 			"ISSUETYPE": "Типы задач",
-			"DEFAULT_ISSUE_TYPE": "Default Issue Type",
+			"DEFAULT_ISSUE_TYPE": "Тип проблемы по умолчанию",
+			"NO_DEFAULT_ISSUE_TYPE": "Тип проблемы по умолчанию отсутствует",
 			"LIST_OF_ISSUES": "Список задач",
 			"RELATED_ISSUE_TYPE": "Связанные типы задач",
 			"LIST_OF_RELATED_TYPE": "Список связанных типов",
@@ -589,6 +591,18 @@
 		"REMOVE_FROM_THIS_PLAN": "Убрать из этого плана",
 		"CREATE_A_PLAN_FOR_TODAY": "Создать план на сегодня",
 		"TODAY_PLAN_SUB_TITLE": "На сегодня нет плана",
+		"NO_TASK_PLANNED": "Задача не запланирована",
+		"NO_TASK_PLANNED_TODAY": "Задача на сегодня не запланирована",
+		"PLANNED_TIME": "Запланированное время",
+		"ESTIMATED_TIME": "Оценочное время",
+		"TOTAL_TIME_WORKED": "Общее время работы",
+		"COMPLETED_TASKS": "Выполненные задачи",
+		"READY": "Готов",
+		"LEFT": "Осталось",
+		"COMPLETION": "Завершение",
+		"PLANNED_TASKS": "Запланированная задача",
+		"ESTIMATED": "Оценочный",
+		"TOTAL_TASK": "Всего задач",
 		"DAILY_PLAN_DESCRIPTION": "'Ежедневный план' помогает организовать рабочий процесс для достижения наилучших результатов",
 		"SUGGESTS_TO_ADD_TASK_TO_TODAY_PLAN": "Эта задача не была запланирована в плане на сегодня. Хотите добавить в план?"
 	},
@@ -652,6 +666,17 @@
 		}
 	},
 	"manualTime": {
+		"ADDED_HOURS": "Добавленные часы",
+		"DATE": "Дата",
+		"PICK_A_DATE": "Выберите дату",
+		"START_TIME": "Время начала",
+		"END_TIME": "Время окончания",
+		"TEAM": "Команда",
+		"EMPLOYEE": "Сотрудник",
+		"TASK": "Задача",
+		"DESCRIPTION": "Описание",
+		"OPTIONAL": "Необязательный",
+		"REASON": "Причина",
 		"reasons": {
 			"DEFAULT": "Только ручное время",
 			"LOST_ELECTRICITY": "Потеря электричества",
diff --git a/apps/web/locales/zh.json b/apps/web/locales/zh.json
index 1a9f1764a..67285f6ca 100644
--- a/apps/web/locales/zh.json
+++ b/apps/web/locales/zh.json
@@ -150,6 +150,7 @@
 		"CANCEL": "取消",
 		"DISCARD": "放弃",
 		"EXISTING_MEMBER": "已是成员",
+		"TEAM_MEMBER_EMAIL_ADDRESS": "团队成员电子邮件地址",
 		"NEW_MEMBER": "成为成员",
 		"BACK": "返回",
 		"JOIN_REQUEST": "请求加入",
@@ -421,7 +422,8 @@
 			"VERSIONS": "版本",
 			"LIST_OF_VERSONS": "版本列表",
 			"ISSUETYPE": "议题类型",
-			"DEFAULT_ISSUE_TYPE": "Default Issue Type",
+			"DEFAULT_ISSUE_TYPE": "默认问题类型",
+			"NO_DEFAULT_ISSUE_TYPE": "无默认问题类型",
 			"LIST_OF_ISSUES": "议题列表",
 			"RELATED_ISSUE_TYPE": "相关议题类型",
 			"LIST_OF_RELATED_TYPE": "相关类型列表",
@@ -589,6 +591,18 @@
 		"REMOVE_FROM_THIS_PLAN": "从计划中移除",
 		"CREATE_A_PLAN_FOR_TODAY": "为今天制定计划",
 		"TODAY_PLAN_SUB_TITLE": "今天没有计划",
+		"NO_TASK_PLANNED": "没有计划任务",
+		"NO_TASK_PLANNED_TODAY": "今天没有计划任务",
+		"PLANNED_TIME": "计划时间",
+		"ESTIMATED_TIME": "预计时间",
+		"TOTAL_TIME_WORKED": "总工作时间",
+		"COMPLETED_TASKS": "完成的任务",
+		"READY": "准备好",
+		"LEFT": "剩余",
+		"COMPLETION": "完成度",
+		"PLANNED_TASKS": "计划任务",
+		"ESTIMATED": "预计",
+		"TOTAL_TASK": "总任务",
 		"DAILY_PLAN_DESCRIPTION": "'每日计划' 有助于组织工作流程以实现最佳结果",
 		"SUGGESTS_TO_ADD_TASK_TO_TODAY_PLAN": "此任务未列入今日计划。要添加到计划中吗？"
 	},
@@ -652,6 +666,17 @@
 		}
 	},
 	"manualTime": {
+		"ADDED_HOURS": "添加的小时",
+		"DATE": "日期",
+		"PICK_A_DATE": "选择日期",
+		"START_TIME": "开始时间",
+		"END_TIME": "结束时间",
+		"TEAM": "团队",
+		"EMPLOYEE": "员工",
+		"TASK": "任务",
+		"DESCRIPTION": "描述",
+		"OPTIONAL": "可选",
+		"REASON": "原因",
 		"reasons": {
 			"DEFAULT": "仅手动时间",
 			"LOST_ELECTRICITY": "失去電力",

From a788c9c2bc20d61f6d469501ce3a32a8930c7391 Mon Sep 17 00:00:00 2001
From: "Thierry CH." <thierrybakera12@gmail.com>
Date: Mon, 19 Aug 2024 21:28:46 +0200
Subject: [PATCH 4/5] fix: popup should not appear when the user clicks 'Back'
 (or the profile page) button (#2858)

Co-authored-by: Ruslan Konviser <evereq@gmail.com>
---
 .../lib/features/team-members-card-view.tsx   | 47 ++-----------------
 1 file changed, 3 insertions(+), 44 deletions(-)

diff --git a/apps/web/lib/features/team-members-card-view.tsx b/apps/web/lib/features/team-members-card-view.tsx
index 36c164dca..7368cb600 100644
--- a/apps/web/lib/features/team-members-card-view.tsx
+++ b/apps/web/lib/features/team-members-card-view.tsx
@@ -1,19 +1,10 @@
-import {
-	useAuthenticateUser,
-	useDailyPlan,
-	useModal,
-	useOrganizationEmployeeTeams,
-	useTeamInvitations,
-	useUserProfilePage
-} from '@app/hooks';
+import { useAuthenticateUser, useModal, useOrganizationEmployeeTeams, useTeamInvitations } from '@app/hooks';
 import { Transition } from '@headlessui/react';
 import { InviteFormModal } from './team/invite/invite-form-modal';
 import { InvitedCard, InviteUserTeamCard } from './team/invite/user-invite-card';
 import { InviteUserTeamSkeleton, UserTeamCard, UserTeamCardSkeleton } from '.';
 import { OT_Member } from '@app/interfaces';
-import React, { useCallback, useEffect, useState } from 'react';
-import { DailyPlanCompareEstimatedModal } from './daily-plan';
-import { DAILY_PLAN_ESTIMATE_HOURS_MODAL_DATE } from '@app/constants';
+import React, { useCallback, useEffect } from 'react';
 
 interface Props {
 	teamMembers: OT_Member[];
@@ -30,14 +21,6 @@ const TeamMembersCardView: React.FC<Props> = ({
 }) => {
 	const { isTeamManager } = useAuthenticateUser();
 	const { teamInvitations } = useTeamInvitations();
-	const [isOpen, setIsOpen] = useState(false);
-	const { todayPlan } = useDailyPlan();
-	const profile = useUserProfilePage();
-	const defaultOpenPopup =
-		typeof window !== 'undefined'
-			? window.localStorage.getItem(DAILY_PLAN_ESTIMATE_HOURS_MODAL_DATE) || null
-			: new Date().toISOString().split('T')[0];
-	const plan = todayPlan.find((plan) => plan.date?.toString()?.startsWith(new Date()?.toISOString().split('T')[0]));
 
 	const { updateOrganizationTeamEmployeeOrderOnList } = useOrganizationEmployeeTeams();
 
@@ -48,16 +31,6 @@ const TeamMembersCardView: React.FC<Props> = ({
 
 	useEffect(() => setMemberOrdereds(members), [members]);
 
-	useEffect(() => {
-		if (plan) {
-			const currentDateString = new Date().toISOString().split('T')[0];
-			window.localStorage.setItem(DAILY_PLAN_ESTIMATE_HOURS_MODAL_DATE, currentDateString);
-			if (defaultOpenPopup !== currentDateString || !defaultOpenPopup) {
-				setIsOpen(true);
-			}
-		}
-	}, [defaultOpenPopup, plan]);
-
 	const handleChangeOrder = useCallback(
 		(employee: OT_Member, order: number) => {
 			updateOrganizationTeamEmployeeOrderOnList(employee, order);
@@ -78,22 +51,8 @@ const TeamMembersCardView: React.FC<Props> = ({
 
 	return (
 		<>
-			<DailyPlanCompareEstimatedModal
-				open={isOpen}
-				closeModal={() =>
-					setIsOpen((prev) => {
-						window.localStorage.setItem(
-							DAILY_PLAN_ESTIMATE_HOURS_MODAL_DATE,
-							new Date().toISOString().split('T')[0]
-						);
-						return !prev;
-					})
-				}
-				todayPlan={todayPlan}
-				profile={profile}
-			/>
-
 			<ul className="mt-7" ref={profile.loadTaskStatsIObserverRef}>
+
 				{/* Current authenticated user members */}
 				<Transition
 					show={!!currentUser}

From 31aa333311ca55f325bdb9921b148458c7461687 Mon Sep 17 00:00:00 2001
From: Ruslan Konviser <evereq@gmail.com>
Date: Mon, 19 Aug 2024 21:35:28 +0200
Subject: [PATCH 5/5] Update team-members-card-view.tsx

---
 apps/web/lib/features/team-members-card-view.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/lib/features/team-members-card-view.tsx b/apps/web/lib/features/team-members-card-view.tsx
index 7368cb600..1f91528f3 100644
--- a/apps/web/lib/features/team-members-card-view.tsx
+++ b/apps/web/lib/features/team-members-card-view.tsx
@@ -51,7 +51,7 @@ const TeamMembersCardView: React.FC<Props> = ({
 
 	return (
 		<>
-			<ul className="mt-7" ref={profile.loadTaskStatsIObserverRef}>
+			<ul className="mt-7">
 
 				{/* Current authenticated user members */}
 				<Transition