From 7ca6a45542569ac1e194d2705230f3ac5a29c0de Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 17 Oct 2024 20:36:54 +0200
Subject: [PATCH 1/7] refactor: the timer should not start when the user
 ignores the 'Today plan' popup

---
 .../add-daily-plan-work-hours-modal.tsx       | 39 +++++++++++++------
 .../add-task-estimation-hours-modal.tsx       | 26 +++++++++----
 2 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/apps/web/lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx b/apps/web/lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx
index aa66a0d35..473646fd8 100644
--- a/apps/web/lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx
+++ b/apps/web/lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx
@@ -1,4 +1,4 @@
-import { Card, InputField, Modal, Text } from 'lib/components';
+import { Card, InputField, Modal, SpinnerLoader, Text } from 'lib/components';
 import { Button } from '@components/ui/button';
 import { useCallback, useMemo, useState } from 'react';
 import { DAILY_PLAN_ESTIMATE_HOURS_MODAL_DATE } from '@app/constants';
@@ -19,22 +19,35 @@ export function AddDailyPlanWorkHourModal(props: IAddDailyPlanWorkHoursModalProp
 	const { updateDailyPlan } = useDailyPlan();
 	const { startTimer } = useTimerView();
 	const { activeTeam } = useTeamTasks();
-
 	const [workTimePlanned, setworkTimePlanned] = useState<number | undefined>(plan.workTimePlanned);
 	const currentDate = useMemo(() => new Date().toISOString().split('T')[0], []);
 	const requirePlan = useMemo(() => activeTeam?.requirePlanToTrack, [activeTeam?.requirePlanToTrack]);
 	const hasWorkHours = useMemo(() => plan.workTimePlanned && plan.workTimePlanned > 0, [plan.workTimePlanned]);
+	const [loading, setLoading] = useState(false);
 
 	const handleCloseModal = useCallback(() => {
 		localStorage.setItem(DAILY_PLAN_ESTIMATE_HOURS_MODAL_DATE, currentDate);
 		closeModal();
-		startTimer();
-	}, [closeModal, currentDate, startTimer]);
+	}, [closeModal, currentDate]);
+
+	const handleSubmit = useCallback(async () => {
+		try {
+			setLoading(true);
+
+			// Update the plan work time only if the user changed it
+			plan &&
+				plan.workTimePlanned !== workTimePlanned &&
+				(await updateDailyPlan({ workTimePlanned }, plan.id ?? ''));
+
+			startTimer();
 
-	const handleSubmit = useCallback(() => {
-		updateDailyPlan({ workTimePlanned }, plan.id ?? '');
-		handleCloseModal();
-	}, [handleCloseModal, plan.id, updateDailyPlan, workTimePlanned]);
+			handleCloseModal();
+		} catch (error) {
+			console.log(error);
+		} finally {
+			setLoading(false);
+		}
+	}, [handleCloseModal, plan, startTimer, updateDailyPlan, workTimePlanned]);
 
 	return (
 		<Modal isOpen={isOpen} closeModal={handleCloseModal} showCloseIcon={requirePlan ? false : true}>
@@ -66,7 +79,7 @@ export function AddDailyPlanWorkHourModal(props: IAddDailyPlanWorkHoursModalProp
 						<Button
 							variant="outline"
 							type="submit"
-							className="py-3 px-5 rounded-md font-light text-md dark:text-white dark:bg-slate-700 dark:border-slate-600"
+							className="py-3 px-5 min-w-[10rem] rounded-md font-light text-md dark:text-white dark:bg-slate-700 dark:border-slate-600"
 							onClick={handleCloseModal}
 						>
 							{t('common.SKIP_ADD_LATER')}
@@ -75,10 +88,14 @@ export function AddDailyPlanWorkHourModal(props: IAddDailyPlanWorkHoursModalProp
 							variant="default"
 							type="submit"
 							disabled={requirePlan ? (hasWorkHours ? false : true) : false}
-							className="py-3 px-5 rounded-md font-light text-md dark:text-white"
+							className="py-3 px-5 min-w-[10rem] rounded-md font-light text-md dark:text-white"
 							onClick={handleSubmit}
 						>
-							{t('timer.todayPlanSettings.START_WORKING_BUTTON')}
+							{loading ? (
+								<SpinnerLoader variant="light" size={20} />
+							) : (
+								t('timer.todayPlanSettings.START_WORKING_BUTTON')
+							)}
 						</Button>
 					</div>
 				</div>
diff --git a/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx b/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx
index 07441592f..6f8452e2d 100644
--- a/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx
+++ b/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx
@@ -108,12 +108,24 @@ export function AddTasksEstimationHoursModal(props: IAddTasksEstimationHoursModa
 	/**
 	 * The function that close the Planned tasks modal when the user ignores the modal (Today's plan)
 	 */
-	const closeModalAndStartTimer = useCallback(() => {
-		handleCloseModal();
-		if (canStartWorking) {
-			startTimer();
+	const closeModalAndSubmit = useCallback(async () => {
+		try {
+			setLoading(true);
+
+			// Update the plan work time only if the user changed it
+			plan &&
+				plan.workTimePlanned !== workTimePlanned &&
+				(await updateDailyPlan({ workTimePlanned }, plan.id ?? ''));
+
+			setPlanEditState({ draft: false, saved: true });
+
+			handleCloseModal();
+		} catch (error) {
+			console.log(error);
+		} finally {
+			setLoading(false);
 		}
-	}, [canStartWorking, handleCloseModal, startTimer]);
+	}, [handleCloseModal, plan, updateDailyPlan, workTimePlanned]);
 
 	/**
 	 * The function that opens the Change task modal if conditions are met (or start the timer)
@@ -466,7 +478,7 @@ export function AddTasksEstimationHoursModal(props: IAddTasksEstimationHoursModa
 								variant="outline"
 								type="submit"
 								className="py-3 px-5 w-40 rounded-md font-light text-md dark:text-white dark:bg-slate-700 dark:border-slate-600"
-								onClick={isRenderedInSoftFlow ? closeModalAndStartTimer : handleCloseModal}
+								onClick={isRenderedInSoftFlow ? closeModalAndSubmit : handleCloseModal}
 							>
 								{isRenderedInSoftFlow ? t('common.SKIP_ADD_LATER') : t('common.CANCEL')}
 							</Button>
@@ -489,7 +501,7 @@ export function AddTasksEstimationHoursModal(props: IAddTasksEstimationHoursModa
 	return (
 		<>
 			{isRenderedInSoftFlow ? (
-				<Modal isOpen={isOpen} closeModal={closeModalAndStartTimer} showCloseIcon={requirePlan ? false : true}>
+				<Modal isOpen={isOpen} closeModal={closeModalAndSubmit} showCloseIcon={requirePlan ? false : true}>
 					<Card className="w-[36rem]" shadow="custom">
 						{content}
 					</Card>

From 07f0a94f6832f9225788ff514e0073d1848af06b Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 17 Oct 2024 20:50:48 +0200
Subject: [PATCH 2/7] refactor: the timer should not start when the user
 ignores the 'Today plan' popup

---
 .../lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx b/apps/web/lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx
index 473646fd8..31a8732bb 100644
--- a/apps/web/lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx
+++ b/apps/web/lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx
@@ -87,7 +87,7 @@ export function AddDailyPlanWorkHourModal(props: IAddDailyPlanWorkHoursModalProp
 						<Button
 							variant="default"
 							type="submit"
-							disabled={requirePlan ? (hasWorkHours ? false : true) : false}
+							disabled={loading || (requirePlan ? (hasWorkHours ? false : true) : false)}
 							className="py-3 px-5 min-w-[10rem] rounded-md font-light text-md dark:text-white"
 							onClick={handleSubmit}
 						>

From 27c6fb8ab65c193b0f4530a9633f004faaf3ed52 Mon Sep 17 00:00:00 2001
From: Birusha Ndegeya <142086785+BirushaNdegeya@users.noreply.github.com>
Date: Thu, 17 Oct 2024 23:01:10 +0200
Subject: [PATCH 3/7] fix: task input dropdowns (#3152)

* fix: task input dropdowns

* refactor:  Implement Max-Height
---
 .../web/lib/features/auth-user-task-input.tsx | 96 +++++++++----------
 apps/web/lib/features/task/task-status.tsx    |  2 +-
 2 files changed, 45 insertions(+), 53 deletions(-)

diff --git a/apps/web/lib/features/auth-user-task-input.tsx b/apps/web/lib/features/auth-user-task-input.tsx
index 343dff70b..70bfd69b4 100644
--- a/apps/web/lib/features/auth-user-task-input.tsx
+++ b/apps/web/lib/features/auth-user-task-input.tsx
@@ -7,63 +7,55 @@ import { useAtomValue } from 'jotai';
 import { TaskEstimate } from './task/task-estimate';
 import { TaskInput } from './task/task-input';
 import { TaskLabels } from './task/task-labels';
-import {
-  ActiveTaskPropertiesDropdown,
-  ActiveTaskSizesDropdown,
-  ActiveTaskStatusDropdown
-} from './task/task-status';
+import { ActiveTaskPropertiesDropdown, ActiveTaskSizesDropdown, ActiveTaskStatusDropdown } from './task/task-status';
 import { useTranslations } from 'next-intl';
 
 export function AuthUserTaskInput({ className }: IClassName) {
-  const t = useTranslations();
-  const activeTeamTask = useAtomValue(activeTeamTaskState);
-  const { isTrackingEnabled } = useOrganizationTeams();
+	const t = useTranslations();
+	const activeTeamTask = useAtomValue(activeTeamTaskState);
+	const { isTrackingEnabled } = useOrganizationTeams();
 
-  return (
-    <div
-      className={clsxm('flex-1 flex flex-col mr-10 lg:mt-0 mt-8', className)}
-    >
-      <TaskInput
-        fullWidthCombobox={true}
-        createOnEnterClick={true}
-        showTaskNumber={true}
-        autoAssignTaskAuth={isTrackingEnabled}
-      />
-      <div className="flex gap-5 flex-row lg:items-center justify-between ml-2">
-        <div className="xl:flex mb-4 lg:mb-0">
-          <span className="font-normal text-gray-500 pr-2">
-            {t('common.ESTIMATE')}:
-          </span>
-          <TaskEstimate />
-        </div>
+	return (
+		<div className={clsxm('flex-1 flex flex-col mr-10 lg:mt-0 mt-8', className)}>
+			<TaskInput
+				fullWidthCombobox={true}
+				createOnEnterClick={true}
+				showTaskNumber={true}
+				autoAssignTaskAuth={isTrackingEnabled}
+			/>
+			<div className="flex gap-5 flex-row lg:items-center justify-between ml-2">
+				<div className="xl:flex mb-4 lg:mb-0">
+					<span className="font-normal text-gray-500 pr-2">{t('common.ESTIMATE')}:</span>
+					<TaskEstimate />
+				</div>
 
-        <div className="flex-grow justify-end hidden flex-1 gap-2 md:flex">
-          <ActiveTaskStatusDropdown
-            className="lg:max-w-[190px] w-full"
-            disabled={!activeTeamTask}
-            taskStatusClassName="text-xs py-1.5 w-full"
-          />
+				<div className="flex-grow justify-end hidden flex-1 gap-2 md:flex">
+					<ActiveTaskStatusDropdown
+						className="lg:max-w-[190px] w-full"
+						disabled={!activeTeamTask}
+						taskStatusClassName="text-xs py-1.5 w-full"
+					/>
 
-          <ActiveTaskPropertiesDropdown
-            className="lg:max-w-[190px] w-full"
-            disabled={!activeTeamTask}
-            taskStatusClassName="w-full py-1.5 text-xs"
-          />
+					<ActiveTaskPropertiesDropdown
+						className="lg:max-w-[190px] w-full"
+						disabled={!activeTeamTask}
+						taskStatusClassName="w-full py-1.5 text-xs"
+					/>
 
-          <ActiveTaskSizesDropdown
-            className="lg:max-w-[190px] w-full"
-            disabled={!activeTeamTask}
-            taskStatusClassName="w-full py-1.5 text-xs"
-          />
+					<ActiveTaskSizesDropdown
+						className="lg:max-w-[190px] w-full"
+						disabled={!activeTeamTask}
+						taskStatusClassName="w-full py-1.5 text-xs"
+					/>
 
-          <TaskLabels
-            task={activeTeamTask}
-            className="lg:max-w-[170px] w-full text-xs"
-            forDetails={false}
-            taskStatusClassName="dark:bg-[#1B1D22] dark:border py-[7px] dark:border-[#FFFFFF33] text-xs"
-          />
-        </div>
-        {/* <div className="grid justify-items-center md:hidden">
+					<TaskLabels
+						task={activeTeamTask}
+						className="lg:max-w-[170px] w-full text-xs"
+						forDetails={false}
+						taskStatusClassName="dark:bg-[#1B1D22] dark:border py-[7px] dark:border-[#FFFFFF33] text-xs"
+					/>
+				</div>
+				{/* <div className="grid justify-items-center md:hidden">
 					<div className="flex">
 						<ActiveTaskStatusDropdown className="w-32 mr-2" disabled={!activeTeamTask} />
 						<ActiveTaskPropertiesDropdown className="w-32" disabled={!activeTeamTask} />
@@ -73,7 +65,7 @@ export function AuthUserTaskInput({ className }: IClassName) {
 						<TaskLabels task={activeTeamTask} className="lg:min-w-[170px]" forDetails={false} />
 					</div>
 				</div> */}
-      </div>
-    </div>
-  );
+			</div>
+		</div>
+	);
 }
diff --git a/apps/web/lib/features/task/task-status.tsx b/apps/web/lib/features/task/task-status.tsx
index f79fc5ab6..538dd12f4 100644
--- a/apps/web/lib/features/task/task-status.tsx
+++ b/apps/web/lib/features/task/task-status.tsx
@@ -1075,7 +1075,7 @@ export function StatusDropdown<T extends TStatusItem>({
 									<Listbox.Options className="outline-none">
 										<Card
 											shadow="bigger"
-											className="p-4 md:p-4 shadow-xlcard dark:shadow-lgcard-white dark:bg-[#1B1D22] dark:border dark:border-[#FFFFFF33] flex flex-col gap-2.5"
+											className="p-4 md:p-4 shadow-xlcard dark:shadow-lgcard-white dark:bg-[#1B1D22] dark:border dark:border-[#FFFFFF33] flex flex-col gap-2.5 max-h-[206px] overflow-x-scroll"
 										>
 											{items.map((item, i) => {
 												const item_value = item?.value || item?.name;

From 3665230c2106513568b2c287befdebe1ec6987c6 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Fri, 18 Oct 2024 03:39:29 +0200
Subject: [PATCH 4/7] refactor: enhance the enforce plan mode

---
 .../features/useStartStopTimerHandler.ts      |  2 +-
 apps/web/app/hooks/features/useTimer.ts       |  4 +-
 apps/web/lib/components/modal.tsx             | 54 ++++++++++---------
 apps/web/lib/components/switch.tsx            |  4 ++
 .../add-daily-plan-work-hours-modal.tsx       |  2 +-
 .../add-task-estimation-hours-modal.tsx       | 15 ++----
 .../daily-plan/suggest-daily-plan-modal.tsx   | 23 +++++---
 apps/web/lib/features/user-profile-plans.tsx  | 39 +++++++++++---
 apps/web/locales/ar.json                      |  3 +-
 apps/web/locales/bg.json                      |  3 +-
 apps/web/locales/de.json                      |  3 +-
 apps/web/locales/en.json                      |  3 +-
 apps/web/locales/es.json                      |  3 +-
 apps/web/locales/fr.json                      |  3 +-
 apps/web/locales/he.json                      |  3 +-
 apps/web/locales/it.json                      |  3 +-
 apps/web/locales/nl.json                      |  3 +-
 apps/web/locales/pl.json                      |  3 +-
 apps/web/locales/pt.json                      |  3 +-
 apps/web/locales/ru.json                      |  3 +-
 apps/web/locales/zh.json                      |  3 +-
 21 files changed, 114 insertions(+), 68 deletions(-)

diff --git a/apps/web/app/hooks/features/useStartStopTimerHandler.ts b/apps/web/app/hooks/features/useStartStopTimerHandler.ts
index 1b432a9e7..0968ea4b6 100644
--- a/apps/web/app/hooks/features/useStartStopTimerHandler.ts
+++ b/apps/web/app/hooks/features/useStartStopTimerHandler.ts
@@ -162,7 +162,7 @@ export function useStartStopTimerHandler() {
 		if (timerStatusFetching || !canRunTimer) return;
 		if (timerStatus?.running) {
 			stopTimer();
-		} else if (requirePlan && !isActiveTaskPlaned) {
+		} else if (requirePlan && hasPlan && !isActiveTaskPlaned) {
 			openEnforcePlannedTaskModal();
 		} else {
 			if (
diff --git a/apps/web/app/hooks/features/useTimer.ts b/apps/web/app/hooks/features/useTimer.ts
index f6c222d2e..2a5de21ca 100644
--- a/apps/web/app/hooks/features/useTimer.ts
+++ b/apps/web/app/hooks/features/useTimer.ts
@@ -265,9 +265,7 @@ export function useTimer() {
     user?.isEmailVerified &&
     ((!!activeTeamTask && activeTeamTask.status !== 'closed') ||
       // If timer is running at some other source and user may or may not have selected the task
-      timerStatusRef.current?.lastLog?.source !== TimerSource.TEAMS) &&
-    // If team settings require to have a plan to be able track
-    canTrack;
+      timerStatusRef.current?.lastLog?.source !== TimerSource.TEAMS)
 
   // Local time status
   const {
diff --git a/apps/web/lib/components/modal.tsx b/apps/web/lib/components/modal.tsx
index 84985fc01..4df9f676f 100644
--- a/apps/web/lib/components/modal.tsx
+++ b/apps/web/lib/components/modal.tsx
@@ -15,6 +15,7 @@ type Props = {
 	className?: string;
 	alignCloseIcon?: boolean;
 	showCloseIcon?: boolean;
+	closeOnOutsideClick?: boolean;
 } & PropsWithChildren;
 
 export function Modal({
@@ -27,7 +28,8 @@ export function Modal({
 	description,
 	className,
 	alignCloseIcon,
-	showCloseIcon = true
+	showCloseIcon = true,
+	closeOnOutsideClick = false
 }: Props) {
 	const refDiv = useRef(null);
 
@@ -44,7 +46,7 @@ export function Modal({
 		>
 			<Dialog
 				initialFocus={refDiv}
-				onClose={closeModal}
+				onClose={closeOnOutsideClick ? closeModal : () => null}
 				as="div"
 				className="fixed inset-0 backdrop-brightness-90 backdrop-blur-sm z-[9999] w-full h-full"
 			>
@@ -52,28 +54,32 @@ export function Modal({
 					<Dialog.Overlay
 						className={clsxm('flex justify-center items-center flex-col space-y-1 relative', className)}
 					>
-						{title && <Dialog.Title className={clsxm(titleClass)}>{title}</Dialog.Title>}
-						{description && <Dialog.Description>{description}</Dialog.Description>}
-						{showCloseIcon && (
-							<div
-								onClick={() => {
-									closeModal();
-									customCloseModal?.();
-								}}
-								className={`absolute ${
-									alignCloseIcon ? 'right-2 top-3' : 'right-3 top-3'
-								}  md:right-2 md:top-3 cursor-pointer z-50`}
-							>
-								<Image
-									src={'/assets/svg/close.svg'}
-									alt="close"
-									width={28}
-									height={28}
-									className="w-6 md:w-7"
-								/>
-							</div>
-						)}
-						{children}
+						<Dialog.Panel
+							className={clsxm('flex justify-center items-center flex-col space-y-1 relative', className)}
+						>
+							{title && <Dialog.Title className={clsxm(titleClass)}>{title}</Dialog.Title>}
+							{description && <Dialog.Description>{description}</Dialog.Description>}
+							{showCloseIcon && (
+								<div
+									onClick={() => {
+										closeModal();
+										customCloseModal?.();
+									}}
+									className={`absolute ${
+										alignCloseIcon ? 'right-2 top-3' : 'right-3 top-3'
+									}  md:right-2 md:top-3 cursor-pointer z-50`}
+								>
+									<Image
+										src={'/assets/svg/close.svg'}
+										alt="close"
+										width={28}
+										height={28}
+										className="w-6 md:w-7"
+									/>
+								</div>
+							)}
+							{children}
+						</Dialog.Panel>
 					</Dialog.Overlay>
 				</div>
 			</Dialog>
diff --git a/apps/web/lib/components/switch.tsx b/apps/web/lib/components/switch.tsx
index e88350c4d..62a32779c 100644
--- a/apps/web/lib/components/switch.tsx
+++ b/apps/web/lib/components/switch.tsx
@@ -5,6 +5,7 @@ import { Switch } from '@headlessui/react';
 import { useCallback, useEffect, useState } from 'react';
 import { Text } from './typography';
 import { useTranslations } from 'next-intl';
+import { DAILY_PLAN_SUGGESTION_MODAL_DATE } from '@app/constants';
 
 export default function TimeTrackingToggle({ activeManager }: { activeManager: OT_Member | undefined }) {
 	const t = useTranslations();
@@ -129,6 +130,9 @@ export function RequireDailyPlanToTrack() {
 					.filter((value, index, array) => array.indexOf(value) === index)
 			});
 			setEnabled(!enabled);
+			if (!enabled) {
+				localStorage.removeItem(DAILY_PLAN_SUGGESTION_MODAL_DATE);
+			}
 		}
 	}, [activeTeam, editOrganizationTeam, enabled]);
 
diff --git a/apps/web/lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx b/apps/web/lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx
index 31a8732bb..cb9c11d86 100644
--- a/apps/web/lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx
+++ b/apps/web/lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx
@@ -50,7 +50,7 @@ export function AddDailyPlanWorkHourModal(props: IAddDailyPlanWorkHoursModalProp
 	}, [handleCloseModal, plan, startTimer, updateDailyPlan, workTimePlanned]);
 
 	return (
-		<Modal isOpen={isOpen} closeModal={handleCloseModal} showCloseIcon={requirePlan ? false : true}>
+		<Modal isOpen={isOpen} closeModal={handleCloseModal} showCloseIcon>
 			<Card className="w-full" shadow="custom">
 				<div className="flex flex-col justify-between">
 					<div className="mb-7">
diff --git a/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx b/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx
index 6f8452e2d..ce3eedd96 100644
--- a/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx
+++ b/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx
@@ -57,11 +57,10 @@ export function AddTasksEstimationHoursModal(props: IAddTasksEstimationHoursModa
 	const t = useTranslations();
 	const { updateDailyPlan, myDailyPlans } = useDailyPlan();
 	const { startTimer, timerStatus } = useTimerView();
-	const { activeTeam, activeTeamTask, setActiveTask } = useTeamTasks();
+	const { activeTeamTask, setActiveTask } = useTeamTasks();
 	const [showSearchInput, setShowSearchInput] = useState(false);
 	const [workTimePlanned, setWorkTimePlanned] = useState<number>(plan?.workTimePlanned ?? 0);
 	const currentDate = useMemo(() => new Date().toISOString().split('T')[0], []);
-	const requirePlan = useMemo(() => activeTeam?.requirePlanToTrack, [activeTeam?.requirePlanToTrack]);
 	const tasksEstimationTimes = useMemo(
 		() => (plan && plan.tasks ? estimatedTotalTime(plan.tasks).timesEstimated / 3600 : 0),
 		[plan]
@@ -466,15 +465,7 @@ export function AddTasksEstimationHoursModal(props: IAddTasksEstimationHoursModa
 						</div>
 						<div className=" flex justify-between items-center">
 							<Button
-								disabled={
-									loading || isRenderedInSoftFlow
-										? canStartWorking && requirePlan
-										: timerStatus?.running
-											? canStartWorking && requirePlan && (planEditState.draft || warning)
-												? true
-												: false
-											: canStartWorking && requirePlan && Boolean(warning)
-								}
+								disabled={loading}
 								variant="outline"
 								type="submit"
 								className="py-3 px-5 w-40 rounded-md font-light text-md dark:text-white dark:bg-slate-700 dark:border-slate-600"
@@ -501,7 +492,7 @@ export function AddTasksEstimationHoursModal(props: IAddTasksEstimationHoursModa
 	return (
 		<>
 			{isRenderedInSoftFlow ? (
-				<Modal isOpen={isOpen} closeModal={closeModalAndSubmit} showCloseIcon={requirePlan ? false : true}>
+				<Modal isOpen={isOpen} closeModal={closeModalAndSubmit} showCloseIcon>
 					<Card className="w-[36rem]" shadow="custom">
 						{content}
 					</Card>
diff --git a/apps/web/lib/features/daily-plan/suggest-daily-plan-modal.tsx b/apps/web/lib/features/daily-plan/suggest-daily-plan-modal.tsx
index d0cd0708a..38c5f0b26 100644
--- a/apps/web/lib/features/daily-plan/suggest-daily-plan-modal.tsx
+++ b/apps/web/lib/features/daily-plan/suggest-daily-plan-modal.tsx
@@ -4,7 +4,7 @@ import { useCallback, useMemo } from 'react';
 import { DAILY_PLAN_SUGGESTION_MODAL_DATE, HAS_SEEN_DAILY_PLAN_SUGGESTION_MODAL } from '@app/constants';
 import { useTranslations } from 'next-intl';
 import Link from 'next/link';
-import { useAuthenticateUser } from '@app/hooks';
+import { useAuthenticateUser, useTeamTasks, useTimer } from '@app/hooks';
 import { usePathname } from 'next/navigation';
 
 interface ISuggestDailyPlanModalProps {
@@ -14,27 +14,38 @@ interface ISuggestDailyPlanModalProps {
 
 export function SuggestDailyPlanModal(props: ISuggestDailyPlanModalProps) {
 	const { isOpen, closeModal } = props;
-
+	const { hasPlan } = useTimer();
+	const { activeTeam } = useTeamTasks();
 	const { user } = useAuthenticateUser();
 	const name = useMemo(
 		() => user?.name || user?.firstName || user?.lastName || user?.username || '',
 		[user?.firstName, user?.lastName, user?.name, user?.username]
 	);
+	const requirePlan = useMemo(() => activeTeam?.requirePlanToTrack, [activeTeam?.requirePlanToTrack]);
 	const path = usePathname();
 	const t = useTranslations();
 
 	const currentDate = useMemo(() => new Date().toISOString().split('T')[0], []);
 
 	const handleCloseModal = useCallback(() => {
-		localStorage.setItem(HAS_SEEN_DAILY_PLAN_SUGGESTION_MODAL, currentDate);
+		if (!requirePlan || (requirePlan && hasPlan)) {
+			localStorage.setItem(HAS_SEEN_DAILY_PLAN_SUGGESTION_MODAL, currentDate);
+		}
 		if (path.split('/')[1] == 'profile') {
-			localStorage.setItem(DAILY_PLAN_SUGGESTION_MODAL_DATE, currentDate);
+			if (!requirePlan || (requirePlan && hasPlan)) {
+				localStorage.setItem(DAILY_PLAN_SUGGESTION_MODAL_DATE, currentDate);
+			}
 		}
 		closeModal();
-	}, [closeModal, currentDate, path]);
+	}, [closeModal, currentDate, hasPlan, path, requirePlan]);
 
 	return (
-		<Modal isOpen={isOpen} closeModal={handleCloseModal} showCloseIcon={false}>
+		<Modal
+			closeOnOutsideClick={requirePlan}
+			isOpen={isOpen}
+			closeModal={handleCloseModal}
+			showCloseIcon={requirePlan}
+		>
 			<Card className="w-full" shadow="custom">
 				<div className="flex flex-col items-center justify-between">
 					<div className="mb-7">
diff --git a/apps/web/lib/features/user-profile-plans.tsx b/apps/web/lib/features/user-profile-plans.tsx
index 8ad9a78a6..0ec07b9c9 100644
--- a/apps/web/lib/features/user-profile-plans.tsx
+++ b/apps/web/lib/features/user-profile-plans.tsx
@@ -10,7 +10,14 @@ import { IoCalendarOutline } from 'react-icons/io5';
 
 import { formatDayPlanDate, formatIntegerToHour } from '@app/helpers';
 import { handleDragAndDrop } from '@app/helpers/drag-and-drop';
-import { useAuthenticateUser, useCanSeeActivityScreen, useDailyPlan, useUserProfilePage } from '@app/hooks';
+import {
+	useAuthenticateUser,
+	useCanSeeActivityScreen,
+	useDailyPlan,
+	useTeamTasks,
+	useTimer,
+	useUserProfilePage
+} from '@app/hooks';
 import { useDateRange } from '@app/hooks/useDateRange';
 import { filterDailyPlan } from '@app/hooks/useFilterDateRange';
 import { useLocalStorageState } from '@app/hooks/useLocalStorageState';
@@ -54,9 +61,7 @@ export function UserProfilePlans() {
 	const { todayPlan, futurePlans, pastPlans, outstandingPlans, sortedPlans, profileDailyPlans } = useDailyPlan();
 	const fullWidth = useAtomValue(fullWidthState);
 	const [currentOutstanding, setCurrentOutstanding] = useLocalStorageState<FilterOutstanding>('outstanding', 'ALL');
-
 	const [currentTab, setCurrentTab] = useLocalStorageState<FilterTabs>('daily-plan-tab', 'Today Tasks');
-
 	const [currentDataDailyPlan, setCurrentDataDailyPlan] = useAtom(dataDailyPlanState);
 	const { setDate, date } = useDateRange(currentTab);
 
@@ -77,6 +82,9 @@ export function UserProfilePlans() {
 	const dailyPlanSuggestionModalDate = window && window?.localStorage.getItem(DAILY_PLAN_SUGGESTION_MODAL_DATE);
 	const path = usePathname();
 	const haveSeenDailyPlanSuggestionModal = window?.localStorage.getItem(HAS_SEEN_DAILY_PLAN_SUGGESTION_MODAL);
+	const { hasPlan } = useTimer();
+	const { activeTeam } = useTeamTasks();
+	const requirePlan = useMemo(() => activeTeam?.requirePlanToTrack, [activeTeam?.requirePlanToTrack]);
 
 	// Set the tab plan tab to outstanding if user has no daily plan and there are outstanding tasks (on first load)
 	useEffect(() => {
@@ -85,7 +93,12 @@ export function UserProfilePlans() {
 				setCurrentTab('Outstanding');
 			}
 			if (haveSeenDailyPlanSuggestionModal == new Date().toISOString().split('T')[0]) {
-				window.localStorage.setItem(DAILY_PLAN_SUGGESTION_MODAL_DATE, new Date().toISOString().split('T')[0]);
+				if (!requirePlan || (requirePlan && hasPlan)) {
+					window.localStorage.setItem(
+						DAILY_PLAN_SUGGESTION_MODAL_DATE,
+						new Date().toISOString().split('T')[0]
+					);
+				}
 			}
 		}
 
@@ -207,6 +220,9 @@ function AllPlans({ profile, currentTab = 'All Tasks' }: { profile: any; current
 	const [popupOpen, setPopupOpen] = useState(false);
 	const [currentDeleteIndex, setCurrentDeleteIndex] = useState(0);
 	const { date } = useDateRange(currentTab);
+	const { activeTeam } = useTeamTasks();
+	const requirePlan = useMemo(() => activeTeam?.requirePlanToTrack, [activeTeam?.requirePlanToTrack]);
+	const t = useTranslations();
 
 	if (currentTab === 'Today Tasks') {
 		filteredPlans.current = todayPlan;
@@ -338,21 +354,28 @@ function AllPlans({ profile, currentTab = 'All Tasks' }: { profile: any; current
 																			variant="outline"
 																			className="px-4 py-2 text-sm font-medium text-red-600 border border-red-600 rounded-md bg-light--theme-light dark:!bg-dark--theme-light"
 																		>
-																			Delete this plan
+																			{t('common.plan.DELETE_THIS_PLAN')}
 																		</Button>
 																	}
 																>
 																	{/*button confirm*/}
 																	<Button
 																		disabled={deleteDailyPlanLoading}
-																		onClick={() => deleteDailyPlan(plan.id ?? '')}
+																		onClick={() => {
+																			if (requirePlan) {
+																				localStorage.removeItem(
+																					DAILY_PLAN_SUGGESTION_MODAL_DATE
+																				);
+																			}
+																			deleteDailyPlan(plan.id ?? '');
+																		}}
 																		variant="destructive"
 																		className="flex items-center justify-center px-4 py-2 text-sm font-medium text-white bg-red-600 rounded-md hover:bg-red-700 disabled:bg-red-400"
 																	>
 																		{deleteDailyPlanLoading && (
 																			<ReloadIcon className="w-4 h-4 mr-2 animate-spin" />
 																		)}
-																		Delete
+																		{t('common.DELETE')}
 																	</Button>
 																	{/*button cancel*/}
 																	<Button
@@ -360,7 +383,7 @@ function AllPlans({ profile, currentTab = 'All Tasks' }: { profile: any; current
 																		variant="outline"
 																		className="px-4 py-2 text-sm font-medium text-red-600 border border-red-600 rounded-md bg-light--theme-light dark:!bg-dark--theme-light"
 																	>
-																		Cancel
+																		{t('common.CANCEL')}
 																	</Button>
 																</AlertPopup>
 															</div>
diff --git a/apps/web/locales/ar.json b/apps/web/locales/ar.json
index 8d125389b..0cc29dff3 100644
--- a/apps/web/locales/ar.json
+++ b/apps/web/locales/ar.json
@@ -217,7 +217,8 @@
 			"EDIT_PLAN": "تعديل الخطة",
 			"TRACKED_TIME": "الوقت المتعقب",
 			"SEE_PLANS": "عرض الخطط",
-			"ADD_PLAN": "إضافة خطة"
+			"ADD_PLAN": "إضافة خطة",
+			"DELETE_THIS_PLAN": "احذف هذه الخطة"
 		},
 		"timesheets": {
 			"SINGULAR": "ورقة الحضور",
diff --git a/apps/web/locales/bg.json b/apps/web/locales/bg.json
index 3f8b6fe8c..f401eaa36 100644
--- a/apps/web/locales/bg.json
+++ b/apps/web/locales/bg.json
@@ -217,7 +217,8 @@
 			"EDIT_PLAN": "Редактиране на план",
 			"TRACKED_TIME": "Проследено време",
 			"SEE_PLANS": "Виж планове",
-			"ADD_PLAN": "Добави план"
+			"ADD_PLAN": "Добави план",
+			"DELETE_THIS_PLAN": "Изтрийте този план"
 		},
 		"timesheets": {
 			"SINGULAR": "Работен лист",
diff --git a/apps/web/locales/de.json b/apps/web/locales/de.json
index 133934101..f53a9a886 100644
--- a/apps/web/locales/de.json
+++ b/apps/web/locales/de.json
@@ -217,7 +217,8 @@
 			"EDIT_PLAN": "Plan bearbeiten",
 			"TRACKED_TIME": "Verfolgte Zeit",
 			"SEE_PLANS": "Pläne anzeigen",
-			"ADD_PLAN": "Plan hinzufügen"
+			"ADD_PLAN": "Plan hinzufügen",
+			"DELETE_THIS_PLAN": "Diesen Plan löschen"
 		},
 		"timesheets": {
 			"SINGULAR": "Stundenzettel",
diff --git a/apps/web/locales/en.json b/apps/web/locales/en.json
index 4692276dc..4ec15a92e 100644
--- a/apps/web/locales/en.json
+++ b/apps/web/locales/en.json
@@ -217,7 +217,8 @@
 			"EDIT_PLAN": "Edit Plan",
 			"TRACKED_TIME": "Tracked time",
 			"SEE_PLANS": "See plans",
-			"ADD_PLAN": "Add Plan"
+			"ADD_PLAN": "Add Plan",
+			"DELETE_THIS_PLAN": "Delete this plan"
 		},
 		"timesheets": {
 			"SINGULAR": "Timesheet",
diff --git a/apps/web/locales/es.json b/apps/web/locales/es.json
index 2bfadb58b..5f962410b 100644
--- a/apps/web/locales/es.json
+++ b/apps/web/locales/es.json
@@ -217,7 +217,8 @@
 			"ADD_PLAN": "Agregar Plan",
 			"TRACKED_TIME": "Tiempo registrado",
 			"SEE_PLANS": "Ver planes",
-			"FOR_TOMORROW": "Plan de mañana"
+			"FOR_TOMORROW": "Plan de mañana",
+			"DELETE_THIS_PLAN": "Eliminar este plan"
 		},
 		"timesheets": {
 			"SINGULAR": "Hoja de horas",
diff --git a/apps/web/locales/fr.json b/apps/web/locales/fr.json
index 32440addd..2237827a9 100644
--- a/apps/web/locales/fr.json
+++ b/apps/web/locales/fr.json
@@ -217,7 +217,8 @@
 			"EDIT_PLAN": "Modifier le plan",
 			"TRACKED_TIME": "Temps suivi",
 			"SEE_PLANS": "Voir les plans",
-			"ADD_PLAN": "Ajouter un plan"
+			"ADD_PLAN": "Ajouter un plan",
+			"DELETE_THIS_PLAN": "Supprimer ce plan"
 		},
 		"timesheets": {
 			"SINGULAR": "Feuille de temps",
diff --git a/apps/web/locales/he.json b/apps/web/locales/he.json
index 5d9df1e15..ed4bd8807 100644
--- a/apps/web/locales/he.json
+++ b/apps/web/locales/he.json
@@ -217,7 +217,8 @@
 			"EDIT_PLAN": "ערוך תוכנית",
 			"TRACKED_TIME": "זמן מעקב",
 			"SEE_PLANS": "ראה תוכניות",
-			"ADD_PLAN": "הוסף תוכנית"
+			"ADD_PLAN": "הוסף תוכנית",
+			"DELETE_THIS_PLAN": "מחק את התוכנית הזו"
 		},
 		"timesheets": {
 			"SINGULAR": "דוח שעות",
diff --git a/apps/web/locales/it.json b/apps/web/locales/it.json
index bd11fbd71..ef56b6976 100644
--- a/apps/web/locales/it.json
+++ b/apps/web/locales/it.json
@@ -221,7 +221,8 @@
 			"EDIT_PLAN": "Modifica Piano",
 			"TRACKED_TIME": "Tempo tracciato",
 			"SEE_PLANS": "Vedi piani",
-			"ADD_PLAN": "Aggiungi Piano"
+			"ADD_PLAN": "Aggiungi Piano",
+			"DELETE_THIS_PLAN": "Elimina questo piano"
 		},
 		"COPY_ISSUE_LINK": "Copia collegamento problema",
 		"MAKE_A_COPY": "Fai una copia",
diff --git a/apps/web/locales/nl.json b/apps/web/locales/nl.json
index c59d6f29d..dec963075 100644
--- a/apps/web/locales/nl.json
+++ b/apps/web/locales/nl.json
@@ -221,7 +221,8 @@
 			"EDIT_PLAN": "Plan bewerken",
 			"TRACKED_TIME": "Gegeneraliseerde tijd",
 			"SEE_PLANS": "Plannen bekijken",
-			"ADD_PLAN": "Plan toevoegen"
+			"ADD_PLAN": "Plan toevoegen",
+			"DELETE_THIS_PLAN": "Verwijder dit plan"
 		},
 		"COPY_ISSUE_LINK": "Probleemlink kopiëren",
 		"MAKE_A_COPY": "Maak een kopie",
diff --git a/apps/web/locales/pl.json b/apps/web/locales/pl.json
index 013652426..566aec919 100644
--- a/apps/web/locales/pl.json
+++ b/apps/web/locales/pl.json
@@ -221,7 +221,8 @@
 			"EDIT_PLAN": "Edytuj plan",
 			"TRACKED_TIME": "Śledzony czas",
 			"SEE_PLANS": "Zobacz plany",
-			"ADD_PLAN": "Dodaj plan"
+			"ADD_PLAN": "Dodaj plan",
+			"DELETE_THIS_PLAN": "Usuń ten plan"
 		},
 		"COPY_ISSUE_LINK": "Skopiuj link do zgłoszenia",
 		"MAKE_A_COPY": "Zrób kopię",
diff --git a/apps/web/locales/pt.json b/apps/web/locales/pt.json
index a21389cf1..e907d74e9 100644
--- a/apps/web/locales/pt.json
+++ b/apps/web/locales/pt.json
@@ -221,7 +221,8 @@
 			"EDIT_PLAN": "Editar Plano",
 			"TRACKED_TIME": "Tempo rastreado",
 			"SEE_PLANS": "Ver planos",
-			"ADD_PLAN": "Adicionar Plano"
+			"ADD_PLAN": "Adicionar Plano",
+			"DELETE_THIS_PLAN": "Excluir este plano"
 		},
 		"COPY_ISSUE_LINK": "Copiar link do problema",
 		"MAKE_A_COPY": "Fazer uma cópia",
diff --git a/apps/web/locales/ru.json b/apps/web/locales/ru.json
index 7c58dd7a6..63081f89b 100644
--- a/apps/web/locales/ru.json
+++ b/apps/web/locales/ru.json
@@ -221,7 +221,8 @@
 			"EDIT_PLAN": "Редактировать план",
 			"TRACKED_TIME": "Отслеживаемое время",
 			"SEE_PLANS": "Посмотреть планы",
-			"ADD_PLAN": "Agregar Plan"
+			"ADD_PLAN": "Agregar Plan",
+			"DELETE_THIS_PLAN": "Удалить этот план"
 		},
 		"COPY_ISSUE_LINK": "Скопировать ссылку на проблему",
 		"MAKE_A_COPY": "Сделать копию",
diff --git a/apps/web/locales/zh.json b/apps/web/locales/zh.json
index 5e8860b36..b3e5bae92 100644
--- a/apps/web/locales/zh.json
+++ b/apps/web/locales/zh.json
@@ -221,7 +221,8 @@
 			"EDIT_PLAN": "编辑计划",
 			"TRACKED_TIME": "跟踪时间",
 			"SEE_PLANS": "查看计划",
-			"ADD_PLAN": "添加计划"
+			"ADD_PLAN": "添加计划",
+			"DELETE_THIS_PLAN": "删除此计划"
 		},
 		"COPY_ISSUE_LINK": "复制问题链接",
 		"MAKE_A_COPY": "制作副本",

From 9746b83fb567223f730f5e71fba0262d3316e2c5 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Fri, 18 Oct 2024 12:05:17 +0200
Subject: [PATCH 5/7] add requested changes

---
 .../daily-plan/add-daily-plan-work-hours-modal.tsx        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/web/lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx b/apps/web/lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx
index cb9c11d86..eb8ab7fc1 100644
--- a/apps/web/lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx
+++ b/apps/web/lib/features/daily-plan/add-daily-plan-work-hours-modal.tsx
@@ -35,9 +35,9 @@ export function AddDailyPlanWorkHourModal(props: IAddDailyPlanWorkHoursModalProp
 			setLoading(true);
 
 			// Update the plan work time only if the user changed it
-			plan &&
-				plan.workTimePlanned !== workTimePlanned &&
-				(await updateDailyPlan({ workTimePlanned }, plan.id ?? ''));
+			if (plan && plan.workTimePlanned !== workTimePlanned) {
+				await updateDailyPlan({ workTimePlanned }, plan.id ?? '');
+			}
 
 			startTimer();
 
@@ -87,7 +87,7 @@ export function AddDailyPlanWorkHourModal(props: IAddDailyPlanWorkHoursModalProp
 						<Button
 							variant="default"
 							type="submit"
-							disabled={loading || (requirePlan ? (hasWorkHours ? false : true) : false)}
+							disabled={loading || (requirePlan && !hasWorkHours)}
 							className="py-3 px-5 min-w-[10rem] rounded-md font-light text-md dark:text-white"
 							onClick={handleSubmit}
 						>

From 351bf1e2bf422266f0ebcfeb7d1966db13a9f083 Mon Sep 17 00:00:00 2001
From: Serge Muhundu <54764431+Sergemuhundu@users.noreply.github.com>
Date: Thu, 24 Oct 2024 17:42:16 +0100
Subject: [PATCH 6/7] Feat/add env vars (#3160)

* Add env vars placeholders for expo

* put back ever team credentials

* Put back eas.json file, deleted by mistake

* update github workflow for android and ios
---
 .github/workflows/mobile.apps.android.yml |  2 +
 .github/workflows/mobile.apps.ios.yml     |  2 +
 .scripts/configure.mobile.ts              |  4 +-
 apps/mobile/.env                          |  2 +
 apps/mobile/app.template.json             |  4 +-
 apps/mobile/eas.json                      | 70 ++++++-----------------
 apps/mobile/package.json                  |  1 +
 apps/mobile/yarn.lock                     |  5 ++
 eas.json                                  | 21 +++++++
 package.json                              | 10 ++--
 yarn.lock                                 | 46 +++++----------
 11 files changed, 75 insertions(+), 92 deletions(-)
 create mode 100644 eas.json

diff --git a/.github/workflows/mobile.apps.android.yml b/.github/workflows/mobile.apps.android.yml
index fd1d9ece6..4269fba01 100644
--- a/.github/workflows/mobile.apps.android.yml
+++ b/.github/workflows/mobile.apps.android.yml
@@ -70,6 +70,8 @@ jobs:
           EXPO_PROJECT_NAME: ${{ secrets.EXPO_PROJECT_NAME }}
           EXPO_PROJECT_OWNER: ${{ secrets.EXPO_PROJECT_OWNER }}
           EXPO_PROJECT_ID: ${{ secrets.EXPO_PROJECT_ID }}
+          EXPO_PROJECT_PACKAGE_NAME: ${{ secrets.EXPO_PROJECT_PACKAGE_NAME }}
+          EXPO_PROJECT_IOS_BUNDLE_IDENTIFIER: ${{ secrets.EXPO_PROJECT_IOS_BUNDLE_IDENTIFIER }}
 
       - name: Build on EAS
         run: cd apps/mobile && eas build --platform android --non-interactive
diff --git a/.github/workflows/mobile.apps.ios.yml b/.github/workflows/mobile.apps.ios.yml
index 6c6b30bdc..579a36f12 100644
--- a/.github/workflows/mobile.apps.ios.yml
+++ b/.github/workflows/mobile.apps.ios.yml
@@ -76,6 +76,8 @@ jobs:
           EXPO_PROJECT_NAME: ${{ secrets.EXPO_PROJECT_NAME }}
           EXPO_PROJECT_OWNER: ${{ secrets.EXPO_PROJECT_OWNER }}
           EXPO_PROJECT_ID: ${{ secrets.EXPO_PROJECT_ID }}
+          EXPO_PROJECT_PACKAGE_NAME: ${{ secrets.EXPO_PROJECT_PACKAGE_NAME }}
+          EXPO_PROJECT_IOS_BUNDLE_IDENTIFIER: ${{ secrets.EXPO_PROJECT_IOS_BUNDLE_IDENTIFIER }}
 
       - name: Build on EAS
         run: cd apps/mobile && eas build --platform ios --non-interactive
diff --git a/.scripts/configure.mobile.ts b/.scripts/configure.mobile.ts
index 66e05c3a3..29a8fc490 100644
--- a/.scripts/configure.mobile.ts
+++ b/.scripts/configure.mobile.ts
@@ -23,7 +23,9 @@ fs.copyFile(templatePath, appJsonPath, (err) => {
       .replace(/\$EXPO_PROJECT_SLUG/g, process.env.EXPO_PROJECT_SLUG)
       .replace(/\$EXPO_PROJECT_NAME/g, process.env.EXPO_PROJECT_NAME)
       .replace(/\$EXPO_PROJECT_OWNER/g, process.env.EXPO_PROJECT_OWNER)
-      .replace(/\$EXPO_PROJECT_ID/g, process.env.EXPO_PROJECT_ID);
+      .replace(/\$EXPO_PROJECT_ID/g, process.env.EXPO_PROJECT_ID)
+      .replace(/\$EXPO_PROJECT_PACKAGE_NAME/g, process.env.EXPO_PROJECT_PACKAGE_NAME)
+      .replace(/\$EXPO_PROJECT_IOS_BUNDLE_IDENTIFIER/g, process.env.EXPO_PROJECT_IOS_BUNDLE_IDENTIFIER);
 
     fs.writeFile(appJsonPath, updatedData, (err) => {
       if (err) {
diff --git a/apps/mobile/.env b/apps/mobile/.env
index f07c6ee3f..63c69acaa 100644
--- a/apps/mobile/.env
+++ b/apps/mobile/.env
@@ -10,3 +10,5 @@ EXPO_PROJECT_SLUG=ever-teams-mobile
 EXPO_PROJECT_NAME=Ever Teams Mobile
 EXPO_PROJECT_OWNER=everco
 EXPO_PROJECT_ID=2ff924e4-7a91-4b23-9db9-7453a8063bb0
+EXPO_PROJECT_PACKAGE_NAME=ever.team
+EXPO_PROJECT_IOS_BUNDLE_IDENTIFIER=co.ever.teams
diff --git a/apps/mobile/app.template.json b/apps/mobile/app.template.json
index f48f6bce9..550a27e47 100644
--- a/apps/mobile/app.template.json
+++ b/apps/mobile/app.template.json
@@ -44,7 +44,7 @@
 		],
 		"android": {
 			"icon": "./assets/images/app-icon-android-legacy-ever-teams.png",
-			"package": "ever.team",
+			"package": "$EXPO_PROJECT_PACKAGE_NAME",
 			"adaptiveIcon": {
 				"foregroundImage": "./assets/images/app-icon-android-adaptive-foreground-ever.png",
 				"backgroundImage": "./assets/images/app-icon-android-adaptive-background.png"
@@ -63,7 +63,7 @@
 		"ios": {
 			"icon": "./assets/images/app-icon-ios-ever-teams.png",
 			"supportsTablet": true,
-			"bundleIdentifier": "co.ever.teams",
+			"bundleIdentifier": "$EXPO_PROJECT_IOS_BUNDLE_IDENTIFIER",
 			"splash": {
 				"image": "./assets/images/splash-ever-teams.png",
 				"tabletImage": "./assets/images/splash-logo-ever-teams-ios-tablet.png",
diff --git a/apps/mobile/eas.json b/apps/mobile/eas.json
index 6bcd4efad..72df2ccf8 100644
--- a/apps/mobile/eas.json
+++ b/apps/mobile/eas.json
@@ -1,53 +1,21 @@
 {
-	"cli": {
-		"appVersionSource": "remote"
-	},
-	"build": {
-		"development": {
-			"extends": "production",
-			"developmentClient": true,
-			"distribution": "internal",
-			"ios": {
-				"simulator": true
-			},
-			"android": {
-				"buildType": "apk"
-			},
-			"channel": "development"
-		},
-		"preview": {
-			"extends": "production",
-			"distribution": "internal",
-			"channel": "preview",
-			"ios": {
-				"simulator": true
-			},
-			"android": {
-				"buildType": "apk"
-			}
-		},
-		"production": {
-			"autoIncrement": true,
-			"channel": "production",
-			"env": {
-				"GAUZY_API_URL": "https://api.ever.team",
-				"INVITE_CALLBACK_URL": "https://app.ever.team/auth/passcode"
-			}
-		}
-	},
-	"submit": {
-		"production": {
-			"android": {
-				"track": "internal",
-				"releaseStatus": "draft",
-				"changesNotSentForReview": false
-			},
-			"ios": {
-				"ascAppId": "APPLE_ID_PLACEHOLDER",
-				"ascApiKeyIssuerId": "APPSTORE_ISSUER_ID_PLACEHOLDER",
-				"ascApiKeyId": "APPSTORE_API_KEY_ID_PLACEHOLDER",
-				"ascApiKeyPath": "./AuthKey_R9QZ5LP8NK.p8"
-			}
-		}
-	}
+  "cli": {
+    "version": ">= 12.5.3",
+    "appVersionSource": "remote"
+  },
+  "build": {
+    "development": {
+      "developmentClient": true,
+      "distribution": "internal"
+    },
+    "preview": {
+      "distribution": "internal"
+    },
+    "production": {
+      "autoIncrement": true
+    }
+  },
+  "submit": {
+    "production": {}
+  }
 }
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index 0ec2dea5f..1927868b2 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -59,6 +59,7 @@
 		"apisauce": "3.0.0",
 		"axios": "^1.6.0",
 		"date-fns": "^2.29.2",
+		"eas": "^0.1.0",
 		"expo": "~48.0.9",
 		"expo-application": "~5.1.1",
 		"expo-blur": "~12.2.2",
diff --git a/apps/mobile/yarn.lock b/apps/mobile/yarn.lock
index fad785b47..16b3c9884 100644
--- a/apps/mobile/yarn.lock
+++ b/apps/mobile/yarn.lock
@@ -5924,6 +5924,11 @@ duplexify@^3.4.2, duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
+eas@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/eas/-/eas-0.1.0.tgz#cc3c1d8f1aa9439a873670440cf946af1c5707b4"
+  integrity sha512-w88fTTTkfDLHwcaVW8wiYjOtnBBToguzc6AyIldD1vOrCRTKxhQEDS8oIE7nWeSJ+kCoIeoHd79Mhwvntydixg==
+
 easy-stack@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.1.tgz#8afe4264626988cabb11f3c704ccd0c835411066"
diff --git a/eas.json b/eas.json
new file mode 100644
index 000000000..72df2ccf8
--- /dev/null
+++ b/eas.json
@@ -0,0 +1,21 @@
+{
+  "cli": {
+    "version": ">= 12.5.3",
+    "appVersionSource": "remote"
+  },
+  "build": {
+    "development": {
+      "developmentClient": true,
+      "distribution": "internal"
+    },
+    "preview": {
+      "distribution": "internal"
+    },
+    "production": {
+      "autoIncrement": true
+    }
+  },
+  "submit": {
+    "production": {}
+  }
+}
diff --git a/package.json b/package.json
index c865b38ab..4948aeb7a 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
 	"resolutions": {},
 	"dependencies": {
 		"@lexical/react": "^0.8.0",
-		"dotenv": "^16.0.3",
+		"dotenv": "^16.4.5",
 		"lexical": "^0.8.0",
 		"yargs": "^17.5.0"
 	},
@@ -190,6 +190,7 @@
 		"@semantic-release/github": "^9.2.6",
 		"@semantic-release/npm": "^11.0.0",
 		"@types/detox": "^18.1.0",
+		"@types/electron": "^1.6.10",
 		"@types/node": "^20.12.2",
 		"@types/yargs": "^17.0.32",
 		"@typescript-eslint/eslint-plugin": "5.60.1",
@@ -212,21 +213,20 @@
 		"eslint-plugin-prettier": "^4.2.1",
 		"eslint-plugin-react": "^7.31.8",
 		"husky": "^9.0.11",
+		"jimp": "^0.22.7",
 		"lerna": "^8.1.2",
 		"lerna-changelog": "^2.2.0",
 		"lint-staged": "^10.4.0",
 		"nx": "16.7.4",
 		"nx-cloud": "16.3.0",
+		"png-to-ico": "^2.1.8",
 		"prettier": "^3.2.5",
 		"prettier-eslint-cli": "^8.0.1",
 		"pretty-quick": "^4.0.0",
 		"rimraf": "^5.0.5",
 		"semantic-release": "^22.0.12",
 		"simple-git": "^3.20.0",
-		"ts-node": "^10.9.2",
-		"@types/electron": "^1.6.10",
-		"jimp": "^0.22.7",
-		"png-to-ico": "^2.1.8"
+		"ts-node": "^10.9.2"
 	},
 	"overrides": {
 		"prebuild": {
diff --git a/yarn.lock b/yarn.lock
index f3a91d327..81ec4d8db 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13237,16 +13237,16 @@ dotenv-expand@~10.0.0:
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-10.0.0.tgz#12605d00fb0af6d0a592e6558585784032e4ef37"
   integrity sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==
 
-dotenv@^16.0.3, dotenv@~16.3.1:
-  version "16.3.1"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
-  integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==
-
 dotenv@^16.4.1:
   version "16.4.1"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.1.tgz#1d9931f1d3e5d2959350d1250efab299561f7f11"
   integrity sha512-CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ==
 
+dotenv@^16.4.5:
+  version "16.4.5"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f"
+  integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==
+
 dotenv@^8.2.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
@@ -13262,6 +13262,11 @@ dotenv@~10.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
   integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
 
+dotenv@~16.3.1:
+  version "16.3.1"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
+  integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==
+
 dtrace-provider@~0.8:
   version "0.8.8"
   resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.8.tgz#2996d5490c37e1347be263b423ed7b297fb0d97e"
@@ -24672,16 +24677,7 @@ string-to-color@^2.2.2:
     lodash.words "^4.2.0"
     rgb-hex "^3.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -24791,14 +24787,7 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -26848,7 +26837,7 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -26866,15 +26855,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From 938f278dd94adeeb7dae419be9a48ef29c9e1b9a Mon Sep 17 00:00:00 2001
From: "Thierry CH." <thierrybakera12@gmail.com>
Date: Thu, 24 Oct 2024 18:43:25 +0200
Subject: [PATCH 7/7] [Fix](Web): load team members cards on home page (#3167)

* fixbug: load team members cards on home page

* refactor: title for plan without date should be 'the plan date'

* improvement: Today plan | warnings, if no tasks -> 'Please, add tasks'

---------

Co-authored-by: cedric karungu <ckarungu921@gmail.com>
---
 .../add-task-estimation-hours-modal.tsx       | 36 +++++++++++--------
 .../features/daily-plan/all-plans-modal.tsx   | 29 +++++++++++----
 apps/web/lib/features/team-members.tsx        | 28 +++++++--------
 apps/web/locales/ar.json                      |  3 +-
 apps/web/locales/bg.json                      |  3 +-
 apps/web/locales/de.json                      |  3 +-
 apps/web/locales/en.json                      |  3 +-
 apps/web/locales/es.json                      |  3 +-
 apps/web/locales/fr.json                      |  3 +-
 apps/web/locales/he.json                      |  3 +-
 apps/web/locales/it.json                      |  3 +-
 apps/web/locales/nl.json                      |  3 +-
 apps/web/locales/pl.json                      |  3 +-
 apps/web/locales/pt.json                      |  3 +-
 apps/web/locales/ru.json                      |  3 +-
 apps/web/locales/zh.json                      |  3 +-
 16 files changed, 83 insertions(+), 49 deletions(-)

diff --git a/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx b/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx
index 07441592f..6c263cda6 100644
--- a/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx
+++ b/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx
@@ -198,22 +198,28 @@ export function AddTasksEstimationHoursModal(props: IAddTasksEstimationHoursModa
 
 	// Handle warning messages
 	useEffect(() => {
-		// First, check if there are tasks without estimates and show the corresponding warning
-		if (plan?.tasks?.find((task) => !task.estimate)) {
-			setWarning(t('dailyPlan.planned_tasks_popup.warning.TASKS_ESTIMATION'));
-		}
-		// Next, check if no work time is planned or if planned time is invalid
-		else if (!workTimePlanned || workTimePlanned <= 0) {
-			setWarning(t('dailyPlan.planned_tasks_popup.warning.PLANNED_TIME'));
-		}
-		// If the difference between planned and estimated times is significant, check further
-		else if (Math.abs(workTimePlanned - tasksEstimationTimes) > 1) {
-			checkPlannedAndEstimateTimeDiff();
-		}
-		// If all checks pass, clear the warning
-		else {
-			setWarning('');
+		// First,  Check if there are no tasks in the plan
+		if (!plan?.tasks || plan.tasks.length === 0) {
+			setWarning(t('dailyPlan.planned_tasks_popup.warning.PLEASE_ADD_TASKS')); // New warning for no tasks
+		} else {
+			//Check if there are tasks without estimates and show the corresponding warning
+			if (plan.tasks.find((task) => !task.estimate)) {
+				setWarning(t('dailyPlan.planned_tasks_popup.warning.TASKS_ESTIMATION'));
+			}
+			// Next, check if no work time is planned or if planned time is invalid
+			else if (!workTimePlanned || workTimePlanned <= 0) {
+				setWarning(t('dailyPlan.planned_tasks_popup.warning.PLANNED_TIME'));
+			}
+			// If the difference between planned and estimated times is significant, check further
+			else if (Math.abs(workTimePlanned - tasksEstimationTimes) > 1) {
+				checkPlannedAndEstimateTimeDiff();
+			}
+			// If all checks pass, clear the warning
+			else {
+				setWarning('');
+			}
 		}
+
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [workTimePlanned, tasksEstimationTimes, plan?.tasks, myDailyPlans]);
 
diff --git a/apps/web/lib/features/daily-plan/all-plans-modal.tsx b/apps/web/lib/features/daily-plan/all-plans-modal.tsx
index 7ba98059b..b7fbb5c55 100644
--- a/apps/web/lib/features/daily-plan/all-plans-modal.tsx
+++ b/apps/web/lib/features/daily-plan/all-plans-modal.tsx
@@ -165,6 +165,27 @@ export const AllPlansModal = memo(function AllPlansModal(props: IAllPlansModal)
 		[isSameDate, myDailyPlans.items, selectedPlan]
 	);
 
+	// A handler function to display the plan title
+	const displayPlanTitle = (selectedTab: CalendarTab, selectedPlan?: IDailyPlan) => {
+		const isCalendarTab = selectedTab === 'Calendar';
+		const planDate = selectedPlan?.date ? new Date(selectedPlan.date).toLocaleDateString('en-GB') : '';
+		const hasTasks = selectedPlan?.tasks?.length;
+		const isTodayOrTomorrow =
+			selectedTab === 'Today'
+				? t('common.plan.FOR_TODAY')
+				: selectedTab === 'Tomorrow'
+					? t('common.plan.FOR_TOMORROW')
+					: '';
+
+		return isCalendarTab
+			? showCustomPlan && selectedPlan
+				? hasTasks
+					? t('common.plan.FOR_DATE', { date: planDate })
+					: planDate
+				: t('common.plan.PLURAL')
+			: isTodayOrTomorrow;
+	};
+
 	return (
 		<Modal
 			isOpen={isOpen}
@@ -193,13 +214,7 @@ export const AllPlansModal = memo(function AllPlansModal(props: IAllPlansModal)
 						)}
 
 						<Text.Heading as="h3" className="uppercase text-center">
-							{selectedTab == 'Calendar'
-								? showCustomPlan && selectedPlan
-									? t('common.plan.FOR_DATE', {
-											date: new Date(selectedPlan.date).toLocaleDateString('en-GB')
-										})
-									: t('common.plan.PLURAL')
-								: `${selectedTab === 'Today' ? t('common.plan.FOR_TODAY') : selectedTab === 'Tomorrow' ? t('common.plan.FOR_TOMORROW') : ''}`}
+							{displayPlanTitle(selectedTab, selectedPlan)}
 						</Text.Heading>
 					</div>
 					<div className="w-full h-12 flex items-center justify-between">
diff --git a/apps/web/lib/features/team-members.tsx b/apps/web/lib/features/team-members.tsx
index 336189d03..0a922bb9c 100644
--- a/apps/web/lib/features/team-members.tsx
+++ b/apps/web/lib/features/team-members.tsx
@@ -40,23 +40,14 @@ export function TeamMembers({ publicTeam = false, kanbanView: view = IssuesView.
 				: orderedMembers.filter((m) => m.timerStatus === activeFilter);
 	}, [activeFilter, orderedMembers]);
 
-	const currentUser = members.find((m) => m.employee.userId === user?.id);
-
-	const $members = useMemo(() => {
-		return members
-			.filter((member) => member.id !== currentUser?.id)
-			.sort((a, b) => {
-				if (a.order && b.order) return a.order > b.order ? -1 : 1;
-				else return -1;
-			});
-	}, [members, currentUser]);
+	const currentUser = useMemo(() => members.find((m) => m.employee.userId === user?.id), [members, user?.id]);
 
 	const $teamsFetching = teamsFetching && members.length === 0;
 
 	return (
 		<TeamMembersView
 			teamsFetching={$teamsFetching}
-			members={$members}
+			members={members}
 			currentUser={currentUser}
 			fullWidth={fullWidth}
 			publicTeam={publicTeam}
@@ -90,6 +81,15 @@ export function TeamMembersView({
 }: TeamMembersViewProps) {
 	let teamMembersView;
 
+	const $members = useMemo(() => {
+		return members
+			.filter((member) => member.id !== currentUser?.id)
+			.sort((a, b) => {
+				if (a.order && b.order) return a.order > b.order ? -1 : 1;
+				else return -1;
+			});
+	}, [members, currentUser]);
+
 	switch (true) {
 		case members.length === 0:
 			teamMembersView = (
@@ -112,7 +112,7 @@ export function TeamMembersView({
 					{/* <UserTeamCardHeader /> */}
 					<Container fullWidth={fullWidth}>
 						<TeamMembersCardView
-							teamMembers={members}
+							teamMembers={$members}
 							currentUser={currentUser}
 							publicTeam={publicTeam}
 							teamsFetching={teamsFetching}
@@ -134,7 +134,7 @@ export function TeamMembersView({
 						leaveTo="opacity-0"
 					>
 						<TeamMembersTableView
-							teamMembers={members}
+							teamMembers={$members}
 							currentUser={currentUser}
 							publicTeam={publicTeam}
 							active={isMemberActive}
@@ -160,7 +160,7 @@ export function TeamMembersView({
 			teamMembersView = (
 				<Container fullWidth={fullWidth}>
 					<TeamMembersCardView
-						teamMembers={members}
+						teamMembers={$members}
 						currentUser={currentUser}
 						publicTeam={publicTeam}
 						teamsFetching={teamsFetching}
diff --git a/apps/web/locales/ar.json b/apps/web/locales/ar.json
index 8d125389b..0da4e830a 100644
--- a/apps/web/locales/ar.json
+++ b/apps/web/locales/ar.json
@@ -646,7 +646,8 @@
 				"PLANNED_TIME": "يرجى إضافة الوقت المخطط",
 				"TASKS_ESTIMATION": "يرجى تقدير جميع المهام",
 				"OPTIMIZE_PLAN": "الوقت المقدر الإجمالي يتجاوز الوقت المخطط له، يرجى تحسين خطتك",
-				"PLAN_MORE_TASKS": "يرجى إضافة المزيد من المهام إلى الخطة"
+				"PLAN_MORE_TASKS": "يرجى إضافة المزيد من المهام إلى الخطة",
+				"PLEASE_ADD_TASKS": "يرجى إضافة مهام"
 			}
 		},
 		"chang_active_task_popup": {
diff --git a/apps/web/locales/bg.json b/apps/web/locales/bg.json
index 3f8b6fe8c..f73fbe295 100644
--- a/apps/web/locales/bg.json
+++ b/apps/web/locales/bg.json
@@ -646,7 +646,8 @@
 				"PLANNED_TIME": "Моля, добавете планираното време",
 				"TASKS_ESTIMATION": "Моля, оценете всички задачи",
 				"OPTIMIZE_PLAN": "Общото прогнозирано време надвишава планираното време, моля оптимизирайте плана си",
-				"PLAN_MORE_TASKS": "Моля, добавете още задачи към плана"
+				"PLAN_MORE_TASKS": "Моля, добавете още задачи към плана",
+				"PLEASE_ADD_TASKS": "Моля, добавете задачи"
 			}
 		},
 		"chang_active_task_popup": {
diff --git a/apps/web/locales/de.json b/apps/web/locales/de.json
index 133934101..b049c9a1c 100644
--- a/apps/web/locales/de.json
+++ b/apps/web/locales/de.json
@@ -646,7 +646,8 @@
 				"PLANNED_TIME": "Bitte fügen Sie die geplante Zeit hinzu",
 				"TASKS_ESTIMATION": "Bitte schätzen Sie alle Aufgaben",
 				"OPTIMIZE_PLAN": "Die geschätzte Gesamtzeit übersteigt Ihre geplante Zeit, bitte optimieren Sie Ihren Plan",
-				"PLAN_MORE_TASKS": "Bitte fügen Sie dem Plan mehr Aufgaben hinzu"
+				"PLAN_MORE_TASKS": "Bitte fügen Sie dem Plan mehr Aufgaben hinzu",
+				"PLEASE_ADD_TASKS": "Bitte fügen Sie Aufgaben hinzu"
 			}
 		},
 		"chang_active_task_popup": {
diff --git a/apps/web/locales/en.json b/apps/web/locales/en.json
index 4692276dc..54788f7c5 100644
--- a/apps/web/locales/en.json
+++ b/apps/web/locales/en.json
@@ -646,7 +646,8 @@
 				"PLANNED_TIME": "Please, add planned time",
 				"TASKS_ESTIMATION": "Please, estimate all tasks",
 				"OPTIMIZE_PLAN": "Total estimated time exceeds your Planned time, please optimize your plan",
-				"PLAN_MORE_TASKS": "Please add more tasks to the plan"
+				"PLAN_MORE_TASKS": "Please add more tasks to the plan",
+				"PLEASE_ADD_TASKS": "Please, add tasks"
 			}
 		},
 		"chang_active_task_popup": {
diff --git a/apps/web/locales/es.json b/apps/web/locales/es.json
index 2bfadb58b..a62f626cb 100644
--- a/apps/web/locales/es.json
+++ b/apps/web/locales/es.json
@@ -646,7 +646,8 @@
 				"PLANNED_TIME": "Por favor, añade tiempo planificado",
 				"TASKS_ESTIMATION": "Por favor, estima todas las tareas",
 				"OPTIMIZE_PLAN": "El tiempo total estimado excede tu tiempo planificado, por favor optimiza tu plan",
-				"PLAN_MORE_TASKS": "Por favor, añade más tareas al plan"
+				"PLAN_MORE_TASKS": "Por favor, añade más tareas al plan",
+				"PLEASE_ADD_TASKS": "Por favor, añade tareas"
 			}
 		},
 		"chang_active_task_popup": {
diff --git a/apps/web/locales/fr.json b/apps/web/locales/fr.json
index 32440addd..80b432fa3 100644
--- a/apps/web/locales/fr.json
+++ b/apps/web/locales/fr.json
@@ -646,7 +646,8 @@
 				"PLANNED_TIME": "Veuillez ajouter le temps planifié",
 				"TASKS_ESTIMATION": "Veuillez estimer toutes les tâches",
 				"OPTIMIZE_PLAN": "Le temps total estimé dépasse votre temps planifié, veuillez optimiser votre plan",
-				"PLAN_MORE_TASKS": "Veuillez ajouter plus de tâches au plan"
+				"PLAN_MORE_TASKS": "Veuillez ajouter plus de tâches au plan",
+				"PLEASE_ADD_TASKS": "Veuillez ajouter des tâches"
 			}
 		},
 		"chang_active_task_popup": {
diff --git a/apps/web/locales/he.json b/apps/web/locales/he.json
index 5d9df1e15..5da647fee 100644
--- a/apps/web/locales/he.json
+++ b/apps/web/locales/he.json
@@ -646,7 +646,8 @@
 				"PLANNED_TIME": "אנא הוסף זמן מתוכנן",
 				"TASKS_ESTIMATION": "אנא הערך את כל המשימות",
 				"OPTIMIZE_PLAN": "הזמן הכולל המשוער חורג מהזמן המתוכנן, אנא מיטב את התוכנית שלך",
-				"PLAN_MORE_TASKS": "אנא הוסף עוד משימות לתוכנית"
+				"PLAN_MORE_TASKS": "אנא הוסף עוד משימות לתוכנית",
+				"PLEASE_ADD_TASKS": "אנא הוסף משימות"
 			}
 		},
 		"chang_active_task_popup": {
diff --git a/apps/web/locales/it.json b/apps/web/locales/it.json
index bd11fbd71..4b4b34e18 100644
--- a/apps/web/locales/it.json
+++ b/apps/web/locales/it.json
@@ -646,7 +646,8 @@
 				"PLANNED_TIME": "Per favore, aggiungi il tempo pianificato",
 				"TASKS_ESTIMATION": "Per favore, stima tutte le attività",
 				"OPTIMIZE_PLAN": "Il tempo totale stimato supera il tempo pianificato, per favore ottimizza il tuo piano",
-				"PLAN_MORE_TASKS": "Per favore, aggiungi più attività al piano"
+				"PLAN_MORE_TASKS": "Per favore, aggiungi più attività al piano",
+				"PLEASE_ADD_TASKS": "Per favore, aggiungi attività"
 			}
 		},
 		"chang_active_task_popup": {
diff --git a/apps/web/locales/nl.json b/apps/web/locales/nl.json
index c59d6f29d..e3bb4f1d8 100644
--- a/apps/web/locales/nl.json
+++ b/apps/web/locales/nl.json
@@ -646,7 +646,8 @@
 				"PLANNED_TIME": "Voeg alstublieft de geplande tijd toe",
 				"TASKS_ESTIMATION": "Schat alstublieft alle taken in",
 				"OPTIMIZE_PLAN": "De totale geschatte tijd overschrijdt uw geplande tijd, optimaliseer uw plan alstublieft",
-				"PLAN_MORE_TASKS": "Voeg alstublieft meer taken aan het plan toe"
+				"PLAN_MORE_TASKS": "Voeg alstublieft meer taken aan het plan toe",
+				"PLEASE_ADD_TASKS": "Voeg alstublieft taken toe"
 			}
 		},
 		"chang_active_task_popup": {
diff --git a/apps/web/locales/pl.json b/apps/web/locales/pl.json
index 013652426..e8e514ad6 100644
--- a/apps/web/locales/pl.json
+++ b/apps/web/locales/pl.json
@@ -646,7 +646,8 @@
 				"PLANNED_TIME": "Proszę dodać planowany czas",
 				"TASKS_ESTIMATION": "Proszę oszacować wszystkie zadania",
 				"OPTIMIZE_PLAN": "Całkowity szacowany czas przekracza planowany czas, proszę zoptymalizować swój plan",
-				"PLAN_MORE_TASKS": "Proszę dodać więcej zadań do planu"
+				"PLAN_MORE_TASKS": "Proszę dodać więcej zadań do planu",
+				"PLEASE_ADD_TASKS": "Proszę dodać zadania"
 			}
 		},
 		"chang_active_task_popup": {
diff --git a/apps/web/locales/pt.json b/apps/web/locales/pt.json
index a21389cf1..8573c0e08 100644
--- a/apps/web/locales/pt.json
+++ b/apps/web/locales/pt.json
@@ -646,7 +646,8 @@
 				"PLANNED_TIME": "Por favor, adicione o tempo planejado",
 				"TASKS_ESTIMATION": "Por favor, estime todas as tarefas",
 				"OPTIMIZE_PLAN": "O tempo total estimado excede o seu tempo planejado, por favor otimize seu plano",
-				"PLAN_MORE_TASKS": "Por favor, adicione mais tarefas ao plano"
+				"PLAN_MORE_TASKS": "Por favor, adicione mais tarefas ao plano",
+				"PLEASE_ADD_TASKS": "Por favor, adicione tarefas"
 			}
 		},
 		"chang_active_task_popup": {
diff --git a/apps/web/locales/ru.json b/apps/web/locales/ru.json
index 7c58dd7a6..780f91e95 100644
--- a/apps/web/locales/ru.json
+++ b/apps/web/locales/ru.json
@@ -646,7 +646,8 @@
 				"PLANNED_TIME": "Пожалуйста, добавьте запланированное время",
 				"TASKS_ESTIMATION": "Пожалуйста, оцените все задачи",
 				"OPTIMIZE_PLAN": "Общее время оценки превышает запланированное время, пожалуйста, оптимизируйте ваш план",
-				"PLAN_MORE_TASKS": "Пожалуйста, добавьте больше задач в план"
+				"PLAN_MORE_TASKS": "Пожалуйста, добавьте больше задач в план",
+				"PLEASE_ADD_TASKS": "Пожалуйста, добавьте задачи"
 			}
 		},
 		"chang_active_task_popup": {
diff --git a/apps/web/locales/zh.json b/apps/web/locales/zh.json
index 5e8860b36..a04ec4398 100644
--- a/apps/web/locales/zh.json
+++ b/apps/web/locales/zh.json
@@ -646,7 +646,8 @@
 				"PLANNED_TIME": "请添加计划时间",
 				"TASKS_ESTIMATION": "请估算所有任务",
 				"OPTIMIZE_PLAN": "总预计时间超过您的计划时间，请优化您的计划",
-				"PLAN_MORE_TASKS": "请在计划中添加更多任务"
+				"PLAN_MORE_TASKS": "请在计划中添加更多任务",
+				"PLEASE_ADD_TASKS": "请添加任务"
 			}
 		},
 		"chang_active_task_popup": {