From 76ab02724aac542909e3f1637b37827beba83312 Mon Sep 17 00:00:00 2001
From: cedric karungu <ckarungu921@gmail.com>
Date: Fri, 26 Jan 2024 06:28:26 +0200
Subject: [PATCH 1/8] fix: collaborate errors

---
 apps/web/app/[locale]/settings/team/page.tsx     | 2 +-
 apps/web/components/shared/collaborate/index.tsx | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/web/app/[locale]/settings/team/page.tsx b/apps/web/app/[locale]/settings/team/page.tsx
index a747a50bc..950603f21 100644
--- a/apps/web/app/[locale]/settings/team/page.tsx
+++ b/apps/web/app/[locale]/settings/team/page.tsx
@@ -37,7 +37,7 @@ const Team = () => {
 			{!user ? (
 				<SettingsTeamSkeleton />
 			) : (
-				<MainLayout className="items-start pb-1">
+				<MainLayout className="items-start pb-1 max-h-s">
 					<div className="pt-12 pb-4 bg-white dark:bg-dark--theme">
 						<Container>
 							<div className="flex items-center gap-8">
diff --git a/apps/web/components/shared/collaborate/index.tsx b/apps/web/components/shared/collaborate/index.tsx
index 696a2d77c..4ba995aab 100644
--- a/apps/web/components/shared/collaborate/index.tsx
+++ b/apps/web/components/shared/collaborate/index.tsx
@@ -92,7 +92,7 @@ const Collaborate = () => {
 							<CommandGroup className="p-2">
 								{members.map((member) => (
 									<CommandItem
-										key={member.id}
+										key={member?.id}
 										className="flex items-center px-2 cursor-pointer"
 										onSelect={() => {
 											handleMemberClick(member);
@@ -135,7 +135,7 @@ const Collaborate = () => {
 											<p className="text-sm font-medium leading-none">{member?.name}</p>
 											<p className="text-xs text-muted-foreground">{member?.email}</p>
 										</div>
-										{selectedMemberIds.includes(member.id) ? (
+										{selectedMemberIds.includes(member?.id) ? (
 											<Check className="flex w-5 h-5 ml-auto text-primary dark:text-white" />
 										) : null}
 									</CommandItem>
@@ -148,7 +148,7 @@ const Collaborate = () => {
 							<div className="flex -space-x-3.5 overflow-hidden">
 								{collaborativeMembers.map((member) => (
 									<div
-										key={member.id}
+										key={member?.id}
 										className={clsxm(
 											'w-[2rem] h-[2rem]',
 											'flex justify-center items-center',

From 7bd8060632f42e324e0f3fbdb3708623abb1d473 Mon Sep 17 00:00:00 2001
From: cedric karungu <ckarungu921@gmail.com>
Date: Fri, 26 Jan 2024 06:34:01 +0200
Subject: [PATCH 2/8] fix: Shared Tasks Components errors

---
 apps/web/components/shared/tasks/assigned-tasks.tsx  | 2 +-
 apps/web/components/shared/tasks/unassigned-task.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/components/shared/tasks/assigned-tasks.tsx b/apps/web/components/shared/tasks/assigned-tasks.tsx
index 9eba02ff9..8e80b7489 100644
--- a/apps/web/components/shared/tasks/assigned-tasks.tsx
+++ b/apps/web/components/shared/tasks/assigned-tasks.tsx
@@ -48,7 +48,7 @@ const AssignedTask = ({ now = false, task }: ITaskDetailCard) => {
 			<div className="flex items-center justify-between ">
 				<div
 					className={`text-black dark:text-[#FFFFFF] text-[14px] ${
-						now == true ? 'font-semibold' : 'font-semibold'
+						now == true ? 'font-semibold' : 'font-normal'
 					} w-[413px]`}
 				>
 					{`#${task && task.taskNumber} `} {task && task.title}
diff --git a/apps/web/components/shared/tasks/unassigned-task.tsx b/apps/web/components/shared/tasks/unassigned-task.tsx
index 014971dcf..e7921069d 100644
--- a/apps/web/components/shared/tasks/unassigned-task.tsx
+++ b/apps/web/components/shared/tasks/unassigned-task.tsx
@@ -50,7 +50,7 @@ const UnAssignedTask = ({ now = false, task }: ITaskDetailCard) => {
 			<div className="flex items-center justify-between ">
 				<div
 					className={`text-black dark:text-[#FFFFFF] text-[14px] ${
-						now == true ? 'font-semibold' : 'font-semibold'
+						now == true ? 'font-semibold' : 'font-medium'
 					} w-[413px]`}
 				>
 					{`#${task && task.taskNumber} `} {task && task.title}

From 779fd4b4ad5d7d2a83f3ade6f2a1eb588e89fbb5 Mon Sep 17 00:00:00 2001
From: cedric karungu <ckarungu921@gmail.com>
Date: Fri, 26 Jan 2024 06:39:36 +0200
Subject: [PATCH 3/8] fix: Tasks Page Component

---
 .../task/details-section/blocks/task-secondary-info.tsx     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web/components/pages/task/details-section/blocks/task-secondary-info.tsx b/apps/web/components/pages/task/details-section/blocks/task-secondary-info.tsx
index 300dd7d14..d0617e95f 100644
--- a/apps/web/components/pages/task/details-section/blocks/task-secondary-info.tsx
+++ b/apps/web/components/pages/task/details-section/blocks/task-secondary-info.tsx
@@ -150,7 +150,7 @@ const TaskSecondaryInfo = () => {
 					taskStatusClassName="text-[0.625rem] h-[1.5625rem] max-w-[7.6875rem] rounded 3xl:text-xs"
 				/>
 			</TaskRow>
-			{tags && tags.length > 0 && (
+			{tags.length > 0 && (
 				<TaskRow>
 					<div className="flex flex-row flex-wrap gap-1 max-w-[10rem]">
 						{tags.map((tag, i) => {
@@ -225,11 +225,11 @@ const TaskSecondaryInfo = () => {
 const EpicParent = ({ task }: { task: ITeamTask }) => {
 	const t = useTranslations();
 
-	if (task.issueType === 'Story') {
+	if (task?.issueType === 'Story') {
 		return <></>;
 	}
 
-	return (!task.issueType || task.issueType === 'Task' || task.issueType === 'Bug') && task?.rootEpic ? (
+	return (!task?.issueType || task?.issueType === 'Task' || task?.issueType === 'Bug') && task?.rootEpic ? (
 		<TaskRow labelTitle={t('pages.taskDetails.EPIC')}>
 			<Tooltip label={`#${task?.rootEpic?.number} ${task?.rootEpic?.title}`} placement="auto">
 				<Link href={`/task/${task?.rootEpic?.id}`} target="_blank">

From d870932845b2bb3c94a142a604007e88cdcebbd6 Mon Sep 17 00:00:00 2001
From: cedric karungu <ckarungu921@gmail.com>
Date: Fri, 26 Jan 2024 06:46:38 +0200
Subject: [PATCH 4/8] fix: Lib Components errors

---
 apps/web/lib/components/inputs/input.tsx | 1 -
 apps/web/lib/components/svgs/icons.tsx   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/web/lib/components/inputs/input.tsx b/apps/web/lib/components/inputs/input.tsx
index 63a1b9e6b..c1baa763c 100644
--- a/apps/web/lib/components/inputs/input.tsx
+++ b/apps/web/lib/components/inputs/input.tsx
@@ -130,7 +130,6 @@ export const TimeInputField = forwardRef<HTMLInputElement, ITimeProps>(
 					<input
 						type={type}
 						ref={ref}
-						defaultValue={value === undefined ? '00' : undefined}
 						value={value}
 						{...res}
 						className={clsxm('outline-none p-0 bg-transparent w-full text-center', className)}
diff --git a/apps/web/lib/components/svgs/icons.tsx b/apps/web/lib/components/svgs/icons.tsx
index d2b2b186b..395347d2e 100644
--- a/apps/web/lib/components/svgs/icons.tsx
+++ b/apps/web/lib/components/svgs/icons.tsx
@@ -2051,7 +2051,7 @@ export function UncheckedBoxIcon({ className }: IClassName) {
 			<path
 				d="M5.8125 13.625H9.1875C12 13.625 13.125 12.5 13.125 9.6875V6.3125C13.125 3.5 12 2.375 9.1875 2.375H5.8125C3 2.375 1.875 3.5 1.875 6.3125V9.6875C1.875 12.5 3 13.625 5.8125 13.625Z"
 				stroke="#292D32"
-				stroke-opacity="0.4"
+				strokeOpacity="0.4"
 				strokeWidth="1.2"
 				strokeLinecap="round"
 				strokeLinejoin="round"

From f605bfc0070276b922b3c4df8f183cdcfda0423c Mon Sep 17 00:00:00 2001
From: cedric karungu <ckarungu921@gmail.com>
Date: Fri, 26 Jan 2024 07:08:15 +0200
Subject: [PATCH 5/8] fix: Lib Features Tasks errors

---
 apps/web/lib/components/color-picker.tsx   | 6 ++----
 apps/web/lib/components/emoji-picker.tsx   | 4 ++--
 apps/web/lib/components/typography.tsx     | 8 ++++++--
 apps/web/lib/features/task/task-card.tsx   | 4 ++--
 apps/web/lib/features/task/task-status.tsx | 2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/apps/web/lib/components/color-picker.tsx b/apps/web/lib/components/color-picker.tsx
index e052bcd9b..9e64308c5 100644
--- a/apps/web/lib/components/color-picker.tsx
+++ b/apps/web/lib/components/color-picker.tsx
@@ -94,7 +94,7 @@ export const ColorPicker = ({
 								<div className="flex mr-[0.5rem] gap-3">
 									<button
 										disabled={!isTeamManager}
-										className={`outline-none ${!isTeamManager && 'pointer-events-none'} z-50`}
+										className={`outline-none z-50`}
 										onClick={() => {
 											setDisabled(!disabled);
 										}}
@@ -107,9 +107,7 @@ export const ColorPicker = ({
 											setColor(null);
 											onChange && onChange(null);
 										}}
-										className={`outline-none ${
-											!isTeamManager ? 'pointer-events-none' : 'cursor-pointer'
-										}`}
+										className={`outline-none ${'cursor-pointer'}`}
 									>
 										<TrashIcon />
 									</span>
diff --git a/apps/web/lib/components/emoji-picker.tsx b/apps/web/lib/components/emoji-picker.tsx
index 7901b2dbb..2b4acf0e6 100644
--- a/apps/web/lib/components/emoji-picker.tsx
+++ b/apps/web/lib/components/emoji-picker.tsx
@@ -85,7 +85,7 @@ export const EmojiPicker = ({
 								<div className="flex mr-[0.5rem] gap-3">
 									<button
 										disabled={!isTeamManager}
-										className={`outline-none ${!isTeamManager && 'pointer-events-none'}`}
+										className={`outline-none `}
 										onClick={() => {
 											setDisabled(!disabled);
 										}}
@@ -97,7 +97,7 @@ export const EmojiPicker = ({
 											setValue(null);
 											onChange('');
 										}}
-										className={`outline-none ${!isTeamManager && 'pointer-events-none'}`}
+										className={`outline-none `}
 									>
 										<TrashIcon />
 									</button>
diff --git a/apps/web/lib/components/typography.tsx b/apps/web/lib/components/typography.tsx
index 4f6d2a9e8..8b737cf94 100644
--- a/apps/web/lib/components/typography.tsx
+++ b/apps/web/lib/components/typography.tsx
@@ -138,9 +138,13 @@ Text.Heading.displayName = 'TextHeading';
  * <label /> by custom
  */
 Text.Label = forwardRef<HTMLLabelElement, Props & React.ComponentPropsWithRef<'label'>>(
-	({ children, className, ...rest }) => {
+	({ children, className, ...rest }, ref) => {
 		return (
-			<label className={clsxm('ml-2 text-sm font-medium text-gray-900 dark:text-gray-300', className)} {...rest}>
+			<label
+				ref={ref}
+				className={clsxm('ml-2 text-sm font-medium text-gray-900 dark:text-gray-300', className)}
+				{...rest}
+			>
 				{children}
 			</label>
 		);
diff --git a/apps/web/lib/features/task/task-card.tsx b/apps/web/lib/features/task/task-card.tsx
index c24f0d2fd..0443edf8c 100644
--- a/apps/web/lib/features/task/task-card.tsx
+++ b/apps/web/lib/features/task/task-card.tsx
@@ -183,7 +183,7 @@ export function TaskCard(props: Props) {
 					</div>
 
 					{/* TaskCardMenu */}
-					{task && memberInfo && currentMember && (
+					{task && currentMember && (
 						<TaskCardMenu task={task} loading={loading} memberInfo={memberInfo} viewType={viewType} />
 					)}
 				</div>
@@ -235,7 +235,7 @@ export function TaskCard(props: Props) {
 
 					<ActiveTaskStatusDropdown task={task || null} onChangeLoading={(load) => setLoading(load)} />
 
-					{task && memberInfo && currentMember && (
+					{task && currentMember && (
 						<TaskCardMenu task={task} loading={loading} memberInfo={memberInfo} viewType={viewType} />
 					)}
 				</div>
diff --git a/apps/web/lib/features/task/task-status.tsx b/apps/web/lib/features/task/task-status.tsx
index 462adafa9..68f993973 100644
--- a/apps/web/lib/features/task/task-status.tsx
+++ b/apps/web/lib/features/task/task-status.tsx
@@ -151,7 +151,7 @@ export function useActiveTaskStatus<T extends ITaskStatusField>(
 
 	const { item, items, onChange } = useStatusValue<T>({
 		status: status,
-		value: props.defaultValue ? props.defaultValue : task ? task[field] : props.defaultValue || undefined,
+		value: props.defaultValue ? props.defaultValue : task ? task[field] : undefined,
 		onValueChange: onItemChange,
 		defaultValues: props.defaultValues
 	});

From db4e7234fb1eb39993112718170a076c7a6da0fa Mon Sep 17 00:00:00 2001
From: cedric karungu <ckarungu921@gmail.com>
Date: Fri, 26 Jan 2024 07:35:41 +0200
Subject: [PATCH 6/8] fix: lib Components errors

---
 apps/web/lib/features/team-member-cell.tsx    |  8 ++++----
 apps/web/lib/features/team-members.tsx        |  2 +-
 apps/web/lib/features/team/team-item.tsx      |  2 +-
 apps/web/lib/settings/integration-setting.tsx |  2 +-
 apps/web/lib/settings/issue-types-form.tsx    |  6 +++---
 apps/web/lib/settings/member-table.tsx        | 10 +---------
 apps/web/lib/settings/team-avatar.tsx         |  2 +-
 apps/web/lib/settings/team-size-popover.tsx   |  6 ++----
 apps/web/lib/settings/transfer-team-modal.tsx |  6 +++---
 9 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/apps/web/lib/features/team-member-cell.tsx b/apps/web/lib/features/team-member-cell.tsx
index 17c152c42..c7962501f 100644
--- a/apps/web/lib/features/team-member-cell.tsx
+++ b/apps/web/lib/features/team-member-cell.tsx
@@ -13,7 +13,7 @@ import get from 'lodash/get';
 export function TaskCell({ row }: { row: any }) {
 	const member = row.original as OT_Member;
 	const memberInfo = useTeamMemberCard(member);
-	const taskEdition = useTMCardTaskEdit(memberInfo?.memberTask);
+	const taskEdition = useTMCardTaskEdit(memberInfo.memberTask);
 	const publicTeam = false;
 
 	return (
@@ -43,8 +43,8 @@ export function WorkedOnTaskCell({ row }: { row: any }) {
 		<TaskTimes
 			activeAuthTask={true}
 			memberInfo={memberInfo}
-			task={memberInfo?.memberTask}
-			isAuthUser={memberInfo?.isAuthUser}
+			task={memberInfo.memberTask}
+			isAuthUser={memberInfo.isAuthUser}
 			className="2xl:w-32 3xl:w-[8rem] min-w-[15rem] w-52 lg:w-1/5  flex flex-col gap-y-[1.125rem] justify-center"
 		/>
 	);
@@ -53,7 +53,7 @@ export function WorkedOnTaskCell({ row }: { row: any }) {
 export function TaskEstimateInfoCell({ row }: { row: any }) {
 	const member = row.original as OT_Member;
 	const memberInfo = useTeamMemberCard(member);
-	const taskEdition = useTMCardTaskEdit(memberInfo?.memberTask);
+	const taskEdition = useTMCardTaskEdit(memberInfo.memberTask);
 
 	return (
 		<TaskEstimateInfo
diff --git a/apps/web/lib/features/team-members.tsx b/apps/web/lib/features/team-members.tsx
index 1d6287ecb..8fb91c684 100644
--- a/apps/web/lib/features/team-members.tsx
+++ b/apps/web/lib/features/team-members.tsx
@@ -25,7 +25,7 @@ export function TeamMembers({ publicTeam = false, kanbanView: view = IssuesView.
 	const orderedMembers = [...members].sort((a, b) => (sortByWorkStatus(a, b) ? -1 : 1));
 
 	const blockViewMembers =
-		activeFilter == 'all' ? orderedMembers : orderedMembers.filter((m) => m.timerStatus == activeFilter) || [];
+		activeFilter == 'all' ? orderedMembers : orderedMembers.filter((m) => m.timerStatus === activeFilter) || [];
 
 	const currentUser = members.find((m) => m.employee.userId === user?.id);
 	const $members = members
diff --git a/apps/web/lib/features/team/team-item.tsx b/apps/web/lib/features/team/team-item.tsx
index ab274ae03..61f5a288b 100644
--- a/apps/web/lib/features/team/team-item.tsx
+++ b/apps/web/lib/features/team/team-item.tsx
@@ -122,7 +122,7 @@ export function TeamItem({
 					style={{
 						background: color || `${stc(title)}80`,
 
-						...(color ? { color: color ? readableColorHex : undefined } : {})
+						...(color ? { color: readableColorHex } : {})
 					}}
 				>
 					{logo && isValidUrl(logo) ? (
diff --git a/apps/web/lib/settings/integration-setting.tsx b/apps/web/lib/settings/integration-setting.tsx
index f83d26852..cb858fe87 100644
--- a/apps/web/lib/settings/integration-setting.tsx
+++ b/apps/web/lib/settings/integration-setting.tsx
@@ -31,7 +31,7 @@ export const IntegrationSetting = () => {
 		} as { [x: string]: string };
 	}, [locale]);
 
-	const queries = new URLSearchParams(params || {});
+	const queries = new URLSearchParams(params);
 	const url = `https://github.com/apps/${GITHUB_APP_NAME.value}/installations/new?${queries.toString()}`;
 
 	const { activeTeam } = useOrganizationTeams();
diff --git a/apps/web/lib/settings/issue-types-form.tsx b/apps/web/lib/settings/issue-types-form.tsx
index cd4843bcf..2852ced95 100644
--- a/apps/web/lib/settings/issue-types-form.tsx
+++ b/apps/web/lib/settings/issue-types-form.tsx
@@ -181,9 +181,9 @@ export const IssueTypesForm = () => {
 									issueTypes.map((type) => (
 										<StatusesListCard
 											key={type.id}
-											statusTitle={type?.name ? type?.name?.split('-').join(' ') : ''}
-											bgColor={type?.color || ''}
-											statusIcon={type?.fullIconUrl || ''}
+											statusTitle={type.name ? type.name?.split('-').join(' ') : ''}
+											bgColor={type.color || ''}
+											statusIcon={type.fullIconUrl || ''}
 											onEdit={() => {
 												setCreateNew(false);
 												setEdit(type);
diff --git a/apps/web/lib/settings/member-table.tsx b/apps/web/lib/settings/member-table.tsx
index a3a3b7329..19ceafa53 100644
--- a/apps/web/lib/settings/member-table.tsx
+++ b/apps/web/lib/settings/member-table.tsx
@@ -207,15 +207,7 @@ export const MemberTable = ({ members }: { members: OT_Member[] }) => {
 								</td>
 								<td className="py-4 text-sm font-semibold">
 									{/* TODO dynamic */}
-									<MemberTableStatus
-										status={
-											member.employee.isActive
-												? 'Member'
-												: !member.employee.isActive
-												? 'Suspended'
-												: 'Left'
-										}
-									/>
+									<MemberTableStatus status={member.employee.isActive ? 'Member' : 'Suspended'} />
 								</td>
 								<td className="flex items-center justify-center py-4">
 									<TableActionPopover member={member} handleEdit={handleEdit} />
diff --git a/apps/web/lib/settings/team-avatar.tsx b/apps/web/lib/settings/team-avatar.tsx
index 2e6f56e15..88de9f198 100644
--- a/apps/web/lib/settings/team-avatar.tsx
+++ b/apps/web/lib/settings/team-avatar.tsx
@@ -80,7 +80,7 @@ export const TeamAvatar = ({ disabled, bgColor }: { disabled: boolean; bgColor?:
 									)}
 									style={{
 										backgroundColor: bgColor || `${stc(activeTeam?.name || '')}80`,
-										...(bgColor ? { color: bgColor ? readableColorHex : undefined } : {})
+										...(bgColor ? { color: readableColorHex } : {})
 									}}
 								>
 									{activeTeam?.image?.thumbUrl || activeTeam?.image?.fullUrl ? (
diff --git a/apps/web/lib/settings/team-size-popover.tsx b/apps/web/lib/settings/team-size-popover.tsx
index 1bf7121cd..dfe730b36 100644
--- a/apps/web/lib/settings/team-size-popover.tsx
+++ b/apps/web/lib/settings/team-size-popover.tsx
@@ -108,10 +108,8 @@ const TeamSize = ({
 							</div>
 							{isTeamManager && (
 								<button
-									className={`flex mr-[0.5rem] gap-3 outline-none ${
-										!isTeamManager && 'pointer-events-none'
-									}`}
-									disabled={!isTeamManager}
+									className={`flex mr-[0.5rem] gap-3 outline-none`}
+									disabled={false}
 									onClick={() => {
 										setDisabled(!disabled);
 									}}
diff --git a/apps/web/lib/settings/transfer-team-modal.tsx b/apps/web/lib/settings/transfer-team-modal.tsx
index 13075e1a3..0571b7041 100644
--- a/apps/web/lib/settings/transfer-team-modal.tsx
+++ b/apps/web/lib/settings/transfer-team-modal.tsx
@@ -59,9 +59,9 @@ export function TransferTeamModal({ open, closeModal }: { open: boolean; closeMo
 									?.filter((member) => member.employee.userId !== user?.id)
 									?.map((member) => ({
 										id: member.employeeId,
-										name: member?.employee?.user?.name || '',
-										title: member?.employee?.user?.name || '',
-										userId: member?.employee?.userId
+										name: member.employee?.user?.name || '',
+										title: member.employee?.user?.name || '',
+										userId: member.employee?.userId
 									}))}
 								selectedMember={selectedMember}
 							/>

From 88300cb5886ebc9a288b8d9b198a04111d53554e Mon Sep 17 00:00:00 2001
From: cedric karungu <ckarungu921@gmail.com>
Date: Fri, 26 Jan 2024 16:01:36 +0200
Subject: [PATCH 7/8] fix: Mobile Scan errors

---
 apps/mobile/app/components/Button.tsx                     | 2 +-
 apps/mobile/app/components/LabelItem.tsx                  | 2 +-
 apps/mobile/app/components/Toggle.tsx                     | 8 ++++----
 apps/mobile/app/models/task/Task.ts                       | 2 +-
 .../ProfileScreen/components/ProfileScreenSkeleton.tsx    | 2 +-
 .../TimerScreen/components/TaskDisplayBox.tsx             | 4 ++--
 .../app/services/client/requests/organization-team.ts     | 2 +-
 .../app/services/hooks/features/useTeamMemberCard.ts      | 2 +-
 apps/mobile/app/services/hooks/useLanguageModal.ts        | 2 +-
 apps/mobile/app/services/hooks/useOrganization.ts         | 2 +-
 apps/mobile/app/services/hooks/useTimezoneModal.ts        | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/mobile/app/components/Button.tsx b/apps/mobile/app/components/Button.tsx
index 63935ce74..a39adda5f 100644
--- a/apps/mobile/app/components/Button.tsx
+++ b/apps/mobile/app/components/Button.tsx
@@ -1,6 +1,6 @@
 import React, { ComponentType } from 'react';
 import { Pressable, PressableProps, PressableStateCallbackType, StyleProp, TextStyle, ViewStyle } from 'react-native';
-import { colors, spacing, typography } from '../theme';
+import { colors, spacing } from '../theme';
 import { Text, TextProps } from './Text';
 
 type Presets = keyof typeof $viewPresets;
diff --git a/apps/mobile/app/components/LabelItem.tsx b/apps/mobile/app/components/LabelItem.tsx
index c13693998..d8191ba57 100644
--- a/apps/mobile/app/components/LabelItem.tsx
+++ b/apps/mobile/app/components/LabelItem.tsx
@@ -3,7 +3,7 @@
 import React, { FC, ReactNode } from 'react';
 import { View, StyleSheet, Text } from 'react-native';
 import { typography } from '../theme';
-import { limitTextCharaters } from '../helpers/sub-text';
+// import { limitTextCharaters } from '../helpers/sub-text';
 
 interface Props {
 	label: string;
diff --git a/apps/mobile/app/components/Toggle.tsx b/apps/mobile/app/components/Toggle.tsx
index af71b2917..487c21bfb 100644
--- a/apps/mobile/app/components/Toggle.tsx
+++ b/apps/mobile/app/components/Toggle.tsx
@@ -385,14 +385,14 @@ function Switch(props: ToggleInputProps) {
 
 		const offsetLeft = ($innerStyleOverride?.paddingStart ||
 			$innerStyleOverride?.paddingLeft ||
-			$switchInner?.paddingStart ||
-			$switchInner?.paddingLeft ||
+			$switchInner.paddingStart ||
+			$switchInner.paddingLeft ||
 			0) as number;
 
 		const offsetRight = ($innerStyleOverride?.paddingEnd ||
 			$innerStyleOverride?.paddingRight ||
-			$switchInner?.paddingEnd ||
-			$switchInner?.paddingRight ||
+			$switchInner.paddingEnd ||
+			$switchInner.paddingRight ||
 			0) as number;
 
 		const start = withTiming(on ? '100%' : '0%');
diff --git a/apps/mobile/app/models/task/Task.ts b/apps/mobile/app/models/task/Task.ts
index 97c856ae4..33fe5bed7 100644
--- a/apps/mobile/app/models/task/Task.ts
+++ b/apps/mobile/app/models/task/Task.ts
@@ -1,4 +1,4 @@
-import { types } from 'mobx-state-tree';
+// import { types } from 'mobx-state-tree';
 import { ITeamTask } from '../../services/interfaces/ITask';
 
 export interface ITaskCreateParams {
diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ProfileScreenSkeleton.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ProfileScreenSkeleton.tsx
index 1e48474d2..0d3f661b2 100644
--- a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ProfileScreenSkeleton.tsx
+++ b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ProfileScreenSkeleton.tsx
@@ -7,7 +7,7 @@ import { useAppTheme } from '../../../../theme';
 
 const ProfileScreenSkeleton = () => {
 	const { colors, dark } = useAppTheme();
-	const { isTeamManager } = useOrganizationTeam();
+	// const { isTeamManager } = useOrganizationTeam();
 
 	const MemberCard = () => {
 		return (
diff --git a/apps/mobile/app/screens/Authenticated/TimerScreen/components/TaskDisplayBox.tsx b/apps/mobile/app/screens/Authenticated/TimerScreen/components/TaskDisplayBox.tsx
index aacc0de5e..64226def3 100644
--- a/apps/mobile/app/screens/Authenticated/TimerScreen/components/TaskDisplayBox.tsx
+++ b/apps/mobile/app/screens/Authenticated/TimerScreen/components/TaskDisplayBox.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { View, StyleSheet, TextInput, Text } from 'react-native';
-import { FontAwesome, AntDesign, Entypo } from '@expo/vector-icons';
+import { View, StyleSheet, Text } from 'react-native';
+import { FontAwesome, AntDesign } from '@expo/vector-icons';
 import { typography, useAppTheme } from '../../../../theme';
 
 type ITasDisplayBox = {
diff --git a/apps/mobile/app/services/client/requests/organization-team.ts b/apps/mobile/app/services/client/requests/organization-team.ts
index d9dd8574f..fa36743ed 100644
--- a/apps/mobile/app/services/client/requests/organization-team.ts
+++ b/apps/mobile/app/services/client/requests/organization-team.ts
@@ -67,7 +67,7 @@ export function getOrganizationTeamRequest(
 		params[`relations[${i}]`] = rl;
 	});
 
-	const queries = new URLSearchParams(params || {});
+	const queries = new URLSearchParams(params);
 	return serverFetch<IOrganizationTeamWithMStatus>({
 		path: `/organization-team/${teamId}?${queries.toString()}`,
 		method: 'GET',
diff --git a/apps/mobile/app/services/hooks/features/useTeamMemberCard.ts b/apps/mobile/app/services/hooks/features/useTeamMemberCard.ts
index 2c45778a3..8f4c4784e 100644
--- a/apps/mobile/app/services/hooks/features/useTeamMemberCard.ts
+++ b/apps/mobile/app/services/hooks/features/useTeamMemberCard.ts
@@ -94,7 +94,7 @@ export function useTeamMemberCard(member: IOrganizationTeamList["members"][numbe
 			const taskStatistics =
 				tasksStatisticsState?.all.find((statistics) => statistics.id === responseTask.id) ||
 				[]
-			responseTask.totalWorkedTime = taskStatistics?.duration || 0
+			responseTask.totalWorkedTime = taskStatistics.duration || 0
 		}
 
 		return responseTask
diff --git a/apps/mobile/app/services/hooks/useLanguageModal.ts b/apps/mobile/app/services/hooks/useLanguageModal.ts
index b762fe39b..3f5756262 100644
--- a/apps/mobile/app/services/hooks/useLanguageModal.ts
+++ b/apps/mobile/app/services/hooks/useLanguageModal.ts
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
 import { ILanguageItemList } from '../interfaces/IUserData';
 
 export function useLanguageModal() {
diff --git a/apps/mobile/app/services/hooks/useOrganization.ts b/apps/mobile/app/services/hooks/useOrganization.ts
index 13c39a332..0a05da4ec 100644
--- a/apps/mobile/app/services/hooks/useOrganization.ts
+++ b/apps/mobile/app/services/hooks/useOrganization.ts
@@ -122,7 +122,7 @@ export function useOrganizationTeam() {
 		getOrganizationTeam();
 	}, [organizationTeams]);
 
-	const activeTeamManagers = members?.filter((m) => m.role?.name === 'MANAGER');
+	const activeTeamManagers = members.filter((m) => m.role?.name === 'MANAGER');
 
 	const isManager = () => {
 		if (activeTeam) {
diff --git a/apps/mobile/app/services/hooks/useTimezoneModal.ts b/apps/mobile/app/services/hooks/useTimezoneModal.ts
index 10caf8738..bdacc55ee 100644
--- a/apps/mobile/app/services/hooks/useTimezoneModal.ts
+++ b/apps/mobile/app/services/hooks/useTimezoneModal.ts
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import { useCallback, useState } from 'react';
 
 export function useTimezoneModal() {
 	const [isModalOpen, setIsModalOpen] = useState(false);

From 8d8fe5dc6bc5c45f3713b31e3c414b1f1435718c Mon Sep 17 00:00:00 2001
From: cedric karungu <ckarungu921@gmail.com>
Date: Fri, 26 Jan 2024 16:07:58 +0200
Subject: [PATCH 8/8] fix: mobile error

---
 .../ProfileScreen/components/ProfileScreenSkeleton.tsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ProfileScreenSkeleton.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ProfileScreenSkeleton.tsx
index 0d3f661b2..0a25ae4fd 100644
--- a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ProfileScreenSkeleton.tsx
+++ b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ProfileScreenSkeleton.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { ScrollView, StyleSheet, View } from 'react-native';
 import { Card } from 'react-native-paper';
 import { Skeleton } from 'react-native-skeletons';
-import { useOrganizationTeam } from '../../../../services/hooks/useOrganization';
+// import { useOrganizationTeam } from '../../../../services/hooks/useOrganization';
 import { useAppTheme } from '../../../../theme';
 
 const ProfileScreenSkeleton = () => {